diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d682b8bb..461b68dd0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## [3.7.2] - 2023-09-23
+- Updated the Zcmop extension
+
 ## [3.7.0] - 2023-05-16
 - Updated the LI macro
 - Make Trap handler compatible for RV32E
diff --git a/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.0-01.S b/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.0-01.S
index e32912aa6..aeb18683e 100644
--- a/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.0-01.S
+++ b/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.0-01.S
@@ -4,8 +4,8 @@
 // version   : 0.11.1
 // timestamp : Sat Sep 23 15:35:30 2023 GMT
 // usage     : riscv_ctg \
-//                  -- cgf //                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/dataset.cgf \
-//                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/zcmop.cgf \
+//                  -- cgf //                  --cgf  /riscv-ctg/sample_cgfs/dataset.cgf \
+//                  --cgf  /riscv-ctg/sample_cgfs/zcmop.cgf \
  \
 //                  -- xlen 32  \
 //                  --randomize \
diff --git a/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.1-01.S b/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.1-01.S
index 4f8da5be7..b525c36aa 100644
--- a/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.1-01.S
+++ b/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.1-01.S
@@ -4,8 +4,8 @@
 // version   : 0.11.1
 // timestamp : Sat Sep 23 15:35:30 2023 GMT
 // usage     : riscv_ctg \
-//                  -- cgf //                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/dataset.cgf \
-//                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/zcmop.cgf \
+//                  -- cgf //                  --cgf  /riscv-ctg/sample_cgfs/dataset.cgf \
+//                  --cgf  /riscv-ctg/sample_cgfs/zcmop.cgf \
  \
 //                  -- xlen 32  \
 //                  --randomize \
diff --git a/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.2-01.S b/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.2-01.S
index 4b94a9592..05d806a96 100644
--- a/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.2-01.S
+++ b/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.2-01.S
@@ -4,8 +4,8 @@
 // version   : 0.11.1
 // timestamp : Sat Sep 23 15:35:30 2023 GMT
 // usage     : riscv_ctg \
-//                  -- cgf //                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/dataset.cgf \
-//                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/zcmop.cgf \
+//                  -- cgf //                  --cgf  /riscv-ctg/sample_cgfs/dataset.cgf \
+//                  --cgf  /riscv-ctg/sample_cgfs/zcmop.cgf \
  \
 //                  -- xlen 32  \
 //                  --randomize \
diff --git a/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.3-01.S b/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.3-01.S
index 4c6420093..ef4966b6c 100644
--- a/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.3-01.S
+++ b/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.3-01.S
@@ -4,8 +4,8 @@
 // version   : 0.11.1
 // timestamp : Sat Sep 23 15:35:30 2023 GMT
 // usage     : riscv_ctg \
-//                  -- cgf //                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/dataset.cgf \
-//                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/zcmop.cgf \
+//                  -- cgf //                  --cgf  /riscv-ctg/sample_cgfs/dataset.cgf \
+//                  --cgf  /riscv-ctg/sample_cgfs/zcmop.cgf \
  \
 //                  -- xlen 32  \
 //                  --randomize \
diff --git a/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.4-01.S b/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.4-01.S
index 24ba823f9..3dbf5532b 100644
--- a/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.4-01.S
+++ b/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.4-01.S
@@ -4,8 +4,8 @@
 // version   : 0.11.1
 // timestamp : Sat Sep 23 15:35:30 2023 GMT
 // usage     : riscv_ctg \
-//                  -- cgf //                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/dataset.cgf \
-//                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/zcmop.cgf \
+//                  -- cgf //                  --cgf  /riscv-ctg/sample_cgfs/dataset.cgf \
+//                  --cgf  /riscv-ctg/sample_cgfs/zcmop.cgf \
  \
 //                  -- xlen 32  \
 //                  --randomize \
diff --git a/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.5-01.S b/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.5-01.S
index e483f41b7..eca260ada 100644
--- a/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.5-01.S
+++ b/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.5-01.S
@@ -4,8 +4,8 @@
 // version   : 0.11.1
 // timestamp : Sat Sep 23 15:35:30 2023 GMT
 // usage     : riscv_ctg \
-//                  -- cgf //                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/dataset.cgf \
-//                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/zcmop.cgf \
+//                  -- cgf //                  --cgf  /riscv-ctg/sample_cgfs/dataset.cgf \
+//                  --cgf  /riscv-ctg/sample_cgfs/zcmop.cgf \
  \
 //                  -- xlen 32  \
 //                  --randomize \
diff --git a/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.6-01.S b/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.6-01.S
index cf2de5ba5..a8fc1c12a 100644
--- a/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.6-01.S
+++ b/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.6-01.S
@@ -4,8 +4,8 @@
 // version   : 0.11.1
 // timestamp : Sat Sep 23 15:35:30 2023 GMT
 // usage     : riscv_ctg \
-//                  -- cgf //                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/dataset.cgf \
-//                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/zcmop.cgf \
+//                  -- cgf //                  --cgf  /riscv-ctg/sample_cgfs/dataset.cgf \
+//                  --cgf  /riscv-ctg/sample_cgfs/zcmop.cgf \
  \
 //                  -- xlen 32  \
 //                  --randomize \
diff --git a/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.7-01.S b/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.7-01.S
index 6fb168bff..8b37caef3 100644
--- a/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.7-01.S
+++ b/riscv-test-suite/rv32i_m/Zcmop/src/c.mop.7-01.S
@@ -4,8 +4,8 @@
 // version   : 0.11.1
 // timestamp : Sat Sep 23 15:35:30 2023 GMT
 // usage     : riscv_ctg \
-//                  -- cgf //                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/dataset.cgf \
-//                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/zcmop.cgf \
+//                  -- cgf //                  --cgf  /riscv-ctg/sample_cgfs/dataset.cgf \
+//                  --cgf  /riscv-ctg/sample_cgfs/zcmop.cgf \
  \
 //                  -- xlen 32  \
 //                  --randomize \
diff --git a/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.0-01.S b/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.0-01.S
index 6bb9fcccd..51bda0eff 100644
--- a/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.0-01.S
+++ b/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.0-01.S
@@ -4,8 +4,8 @@
 // version   : 0.11.1
 // timestamp : Sat Sep 23 15:34:58 2023 GMT
 // usage     : riscv_ctg \
-//                  -- cgf //                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/dataset.cgf \
-//                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/zcmop.cgf \
+//                  -- cgf //                  --cgf  /riscv-ctg/sample_cgfs/dataset.cgf \
+//                  --cgf  /riscv-ctg/sample_cgfs/zcmop.cgf \
  \
 //                  -- xlen 64  \
 //                  --randomize \
diff --git a/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.1-01.S b/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.1-01.S
index 418a9c264..9d14de682 100644
--- a/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.1-01.S
+++ b/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.1-01.S
@@ -4,8 +4,8 @@
 // version   : 0.11.1
 // timestamp : Sat Sep 23 15:34:58 2023 GMT
 // usage     : riscv_ctg \
-//                  -- cgf //                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/dataset.cgf \
-//                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/zcmop.cgf \
+//                  -- cgf //                  --cgf  /riscv-ctg/sample_cgfs/dataset.cgf \
+//                  --cgf  /riscv-ctg/sample_cgfs/zcmop.cgf \
  \
 //                  -- xlen 64  \
 //                  --randomize \
diff --git a/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.2-01.S b/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.2-01.S
index b5e00bca1..a68feb1bf 100644
--- a/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.2-01.S
+++ b/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.2-01.S
@@ -4,8 +4,8 @@
 // version   : 0.11.1
 // timestamp : Sat Sep 23 15:34:58 2023 GMT
 // usage     : riscv_ctg \
-//                  -- cgf //                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/dataset.cgf \
-//                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/zcmop.cgf \
+//                  -- cgf //                  --cgf  /riscv-ctg/sample_cgfs/dataset.cgf \
+//                  --cgf  /riscv-ctg/sample_cgfs/zcmop.cgf \
  \
 //                  -- xlen 64  \
 //                  --randomize \
diff --git a/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.3-01.S b/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.3-01.S
index fdb3cd523..960bfcbad 100644
--- a/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.3-01.S
+++ b/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.3-01.S
@@ -4,8 +4,8 @@
 // version   : 0.11.1
 // timestamp : Sat Sep 23 15:34:58 2023 GMT
 // usage     : riscv_ctg \
-//                  -- cgf //                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/dataset.cgf \
-//                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/zcmop.cgf \
+//                  -- cgf //                  --cgf  /riscv-ctg/sample_cgfs/dataset.cgf \
+//                  --cgf  /riscv-ctg/sample_cgfs/zcmop.cgf \
  \
 //                  -- xlen 64  \
 //                  --randomize \
diff --git a/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.4-01.S b/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.4-01.S
index 8b57047dc..093e87b5b 100644
--- a/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.4-01.S
+++ b/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.4-01.S
@@ -4,8 +4,8 @@
 // version   : 0.11.1
 // timestamp : Sat Sep 23 15:34:58 2023 GMT
 // usage     : riscv_ctg \
-//                  -- cgf //                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/dataset.cgf \
-//                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/zcmop.cgf \
+//                  -- cgf //                  --cgf  /riscv-ctg/sample_cgfs/dataset.cgf \
+//                  --cgf  /riscv-ctg/sample_cgfs/zcmop.cgf \
  \
 //                  -- xlen 64  \
 //                  --randomize \
diff --git a/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.5-01.S b/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.5-01.S
index aaaf97509..d774816c7 100644
--- a/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.5-01.S
+++ b/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.5-01.S
@@ -4,8 +4,8 @@
 // version   : 0.11.1
 // timestamp : Sat Sep 23 15:34:58 2023 GMT
 // usage     : riscv_ctg \
-//                  -- cgf //                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/dataset.cgf \
-//                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/zcmop.cgf \
+//                  -- cgf //                  --cgf  /riscv-ctg/sample_cgfs/dataset.cgf \
+//                  --cgf  /riscv-ctg/sample_cgfs/zcmop.cgf \
  \
 //                  -- xlen 64  \
 //                  --randomize \
diff --git a/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.6-01.S b/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.6-01.S
index ae6eb575c..9cbd894ca 100644
--- a/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.6-01.S
+++ b/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.6-01.S
@@ -4,8 +4,8 @@
 // version   : 0.11.1
 // timestamp : Sat Sep 23 15:34:58 2023 GMT
 // usage     : riscv_ctg \
-//                  -- cgf //                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/dataset.cgf \
-//                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/zcmop.cgf \
+//                  -- cgf //                  --cgf  /riscv-ctg/sample_cgfs/dataset.cgf \
+//                  --cgf  /riscv-ctg/sample_cgfs/zcmop.cgf \
  \
 //                  -- xlen 64  \
 //                  --randomize \
diff --git a/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.7-01.S b/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.7-01.S
index 283ddedcf..848f32b8d 100644
--- a/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.7-01.S
+++ b/riscv-test-suite/rv64i_m/Zcmop/src/c.mop.7-01.S
@@ -4,8 +4,8 @@
 // version   : 0.11.1
 // timestamp : Sat Sep 23 15:34:58 2023 GMT
 // usage     : riscv_ctg \
-//                  -- cgf //                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/dataset.cgf \
-//                  --cgf /home/vedvyas/rvi-code-forks/riscv-ctg/sample_cgfs/zcmop.cgf \
+//                  -- cgf //                  --cgf  /riscv-ctg/sample_cgfs/dataset.cgf \
+//                  --cgf  /riscv-ctg/sample_cgfs/zcmop.cgf \
  \
 //                  -- xlen 64  \
 //                  --randomize \