From 55e5de335e917734f60862876b0c1ba32a66e0fa Mon Sep 17 00:00:00 2001
From: Diyou Shen <dishen@iis.ee.ethz.ch>
Date: Fri, 10 Jul 2026 10:15:27 +0200
Subject: [PATCH 1/9] [Dep] Switch to common_cell v2

---
 Bender.lock                     |  12 +-
 Bender.yml                      |   7 +-
 hw/ip/snitch/src/riscv_instr.sv | 310 ++++----------------------------
 hw/src/generated/spatz_pkg.sv   |   2 +-
 hw/src/reorder_buffer.sv        |   2 +-
 hw/src/spatz.sv                 |  26 +--
 hw/src/spatz_controller.sv      |  26 +--
 hw/src/spatz_doublebw_vlsu.sv   |  61 ++++---
 hw/src/spatz_fpu_sequencer.sv   |  15 +-
 hw/src/spatz_pkg.sv.tpl         |   2 +-
 hw/src/spatz_serdiv.sv          |  12 +-
 hw/src/spatz_vfu.sv             |   7 +-
 hw/src/spatz_vlsu.sv            |  61 ++++---
 hw/src/spatz_vrf.sv             |   3 +-
 hw/src/spatz_vsldu.sv           |  12 +-
 hw/src/vregfile.sv              |   4 +-
 16 files changed, 166 insertions(+), 396 deletions(-)

diff --git a/Bender.lock b/Bender.lock
index ef9b323..a982990 100644
--- a/Bender.lock
+++ b/Bender.lock
@@ -9,8 +9,8 @@ packages:
     - common_verification
     - tech_cells_generic
   common_cells:
-    revision: 9afda9abb565971649c2aa0985639c096f351171
-    version: 1.38.0
+    revision: 65881ba0300209f181ddd34a12a8a2e5df7c07c8
+    version: null
     source:
       Git: https://github.com/pulp-platform/common_cells.git
     dependencies:
@@ -23,10 +23,10 @@ packages:
       Git: https://github.com/pulp-platform/common_verification.git
     dependencies: []
   fpnew:
-    revision: bf2100ff68cf736c50b095169d87231a1fa3cc66
+    revision: 46cb33a4ce6b04b83ec38ebd288dd58a031a6390
     version: null
     source:
-      Git: https://github.com/Jayanth2209/cvfpu.git
+      Git: https://github.com/pulp-platform/cvfpu.git
     dependencies:
     - common_cells
     - fpu_div_sqrt_mvp
@@ -55,8 +55,8 @@ packages:
     - common_cells
     - tech_cells_generic
   tech_cells_generic:
-    revision: 7968dd6e6180df2c644636bc6d2908a49f2190cf
-    version: 0.2.13
+    revision: 3a3de73632a06826b1bd9c65a0a2e92b32016845
+    version: 0.2.14
     source:
       Git: https://github.com/pulp-platform/tech_cells_generic.git
     dependencies:
diff --git a/Bender.yml b/Bender.yml
index d0f172d..7c066e8 100644
--- a/Bender.yml
+++ b/Bender.yml
@@ -10,10 +10,9 @@ package:
     - "Diyou Shen         <dishen@iis.ee.ethz.ch"
 
 dependencies:
-  riscv-dbg:          { git: "https://github.com/pulp-platform/riscv-dbg.git",          version: 0.7.0          }
-  common_cells:       { git: "https://github.com/pulp-platform/common_cells.git",       version: 1.28.0         }
-  FPnew:              { git: "https://github.com/Jayanth2209/cvfpu.git",               rev:     bf2100ff68cf736c50b095169d87231a1fa3cc66 }
-  tech_cells_generic: { git: "https://github.com/pulp-platform/tech_cells_generic.git", version: 0.2.13         }
+  common_cells:       { git: "https://github.com/pulp-platform/common_cells.git",       rev: master             }
+  FPnew:              { git: "https://github.com/pulp-platform/cvfpu.git",              rev: common-cells-v2    }
+  tech_cells_generic: { git: "https://github.com/pulp-platform/tech_cells_generic.git", version: 0.2.14         }
   snitch:             { path: "hw/ip/snitch"                                                                    }
   reqrsp_interface:   { path: "hw/ip/reqrsp_interface"                                                          }
 
diff --git a/hw/ip/snitch/src/riscv_instr.sv b/hw/ip/snitch/src/riscv_instr.sv
index 394a5f9..9d36673 100644
--- a/hw/ip/snitch/src/riscv_instr.sv
+++ b/hw/ip/snitch/src/riscv_instr.sv
@@ -60,6 +60,30 @@ package riscv_instr;
   localparam [31:0] CSRRW              = 32'b?????????????????001?????1110011;
   localparam [31:0] CSRRWI             = 32'b?????????????????101?????1110011;
   localparam [31:0] CTZ                = 32'b011000000001?????001?????0010011;
+  localparam [31:0] CV_LB_IRPOST       = 32'b?????????????????000?????0001011;
+  localparam [31:0] CV_LB_RR           = 32'b0000100??????????011?????0101011;
+  localparam [31:0] CV_LB_RRPOST       = 32'b0000000??????????011?????0101011;
+  localparam [31:0] CV_LBU_IRPOST      = 32'b?????????????????100?????0001011;
+  localparam [31:0] CV_LBU_RR          = 32'b0001100??????????011?????0101011;
+  localparam [31:0] CV_LBU_RRPOST      = 32'b0001000??????????011?????0101011;
+  localparam [31:0] CV_LH_IRPOST       = 32'b?????????????????001?????0001011;
+  localparam [31:0] CV_LH_RR           = 32'b0000101??????????011?????0101011;
+  localparam [31:0] CV_LH_RRPOST       = 32'b0000001??????????011?????0101011;
+  localparam [31:0] CV_LHU_IRPOST      = 32'b?????????????????101?????0001011;
+  localparam [31:0] CV_LHU_RR          = 32'b0001101??????????011?????0101011;
+  localparam [31:0] CV_LHU_RRPOST      = 32'b0001001??????????011?????0101011;
+  localparam [31:0] CV_LW_IRPOST       = 32'b?????????????????010?????0001011;
+  localparam [31:0] CV_LW_RR           = 32'b0000110??????????011?????0101011;
+  localparam [31:0] CV_LW_RRPOST       = 32'b0000010??????????011?????0101011;
+  localparam [31:0] CV_SB_IRPOST       = 32'b?????????????????000?????0101011;
+  localparam [31:0] CV_SB_RR           = 32'b0010100??????????011?????0101011;
+  localparam [31:0] CV_SB_RRPOST       = 32'b0010000??????????011?????0101011;
+  localparam [31:0] CV_SH_IRPOST       = 32'b?????????????????001?????0101011;
+  localparam [31:0] CV_SH_RR           = 32'b0010101??????????011?????0101011;
+  localparam [31:0] CV_SH_RRPOST       = 32'b0010001??????????011?????0101011;
+  localparam [31:0] CV_SW_IRPOST       = 32'b?????????????????010?????0101011;
+  localparam [31:0] CV_SW_RR           = 32'b0010110??????????011?????0101011;
+  localparam [31:0] CV_SW_RRPOST       = 32'b0010010??????????011?????0101011;
   localparam [31:0] DIV                = 32'b0000001??????????100?????0110011;
   localparam [31:0] DIVU               = 32'b0000001??????????101?????0110011;
   localparam [31:0] DIVUW              = 32'b0000001??????????101?????0111011;
@@ -77,43 +101,16 @@ package riscv_instr;
   localparam [31:0] DRET               = 32'b01111011001000000000000001110011;
   localparam [31:0] EBREAK             = 32'b00000000000100000000000001110011;
   localparam [31:0] ECALL              = 32'b00000000000000000000000001110011;
-  localparam [31:0] FADD_AB            = 32'b0000011??????????????????1010011;
-  localparam [31:0] FADD_AH            = 32'b0000010??????????????????1010011;
   localparam [31:0] FADD_B             = 32'b0000011??????????????????1010011;
   localparam [31:0] FADD_D             = 32'b0000001??????????????????1010011;
   localparam [31:0] FADD_H             = 32'b0000010??????????????????1010011;
   localparam [31:0] FADD_Q             = 32'b0000011??????????????????1010011;
   localparam [31:0] FADD_S             = 32'b0000000??????????????????1010011;
-  localparam [31:0] FCLASS_AB          = 32'b111001100000?????001?????1010011;
-  localparam [31:0] FCLASS_AH          = 32'b111001000000?????001?????1010011;
   localparam [31:0] FCLASS_B           = 32'b111001100000?????001?????1010011;
   localparam [31:0] FCLASS_D           = 32'b111000100000?????001?????1010011;
   localparam [31:0] FCLASS_H           = 32'b111001000000?????001?????1010011;
   localparam [31:0] FCLASS_Q           = 32'b111001100000?????001?????1010011;
   localparam [31:0] FCLASS_S           = 32'b111000000000?????001?????1010011;
-  localparam [31:0] FCVT_AB_AB         = 32'b010001100011?????000?????1010011;
-  localparam [31:0] FCVT_AB_AH         = 32'b010001100010?????????????1010011;
-  localparam [31:0] FCVT_AB_B          = 32'b010001100011?????000?????1010011;
-  localparam [31:0] FCVT_AB_D          = 32'b010001100001?????????????1010011;
-  localparam [31:0] FCVT_AB_H          = 32'b010001100010?????????????1010011;
-  localparam [31:0] FCVT_AB_L          = 32'b110101100010?????????????1010011;
-  localparam [31:0] FCVT_AB_LU         = 32'b110101100011?????????????1010011;
-  localparam [31:0] FCVT_AB_S          = 32'b010001100000?????????????1010011;
-  localparam [31:0] FCVT_AB_W          = 32'b110101100000?????????????1010011;
-  localparam [31:0] FCVT_AB_WU         = 32'b110101100001?????????????1010011;
-  localparam [31:0] FCVT_AH_AB         = 32'b010001000011?????000?????1010011;
-  localparam [31:0] FCVT_AH_AH         = 32'b010001000010?????????????1010011;
-  localparam [31:0] FCVT_AH_B          = 32'b010001000011?????000?????1010011;
-  localparam [31:0] FCVT_AH_D          = 32'b010001000001?????????????1010011;
-  localparam [31:0] FCVT_AH_H          = 32'b010001000010?????????????1010011;
-  localparam [31:0] FCVT_AH_L          = 32'b110101000010?????????????1010011;
-  localparam [31:0] FCVT_AH_LU         = 32'b110101000011?????????????1010011;
-  localparam [31:0] FCVT_AH_S          = 32'b010001000000?????????????1010011;
-  localparam [31:0] FCVT_AH_W          = 32'b110101000000?????????????1010011;
-  localparam [31:0] FCVT_AH_WU         = 32'b110101000001?????????????1010011;
-  localparam [31:0] FCVT_B_AB          = 32'b010001100011?????000?????1010011;
-  localparam [31:0] FCVT_B_AH          = 32'b010001100010?????????????1010011;
-  localparam [31:0] FCVT_B_B           = 32'b010001100011?????000?????1010011;
   localparam [31:0] FCVT_B_D           = 32'b010001100001?????????????1010011;
   localparam [31:0] FCVT_B_H           = 32'b010001100010?????????????1010011;
   localparam [31:0] FCVT_B_L           = 32'b110101100010?????????????1010011;
@@ -121,8 +118,6 @@ package riscv_instr;
   localparam [31:0] FCVT_B_S           = 32'b010001100000?????????????1010011;
   localparam [31:0] FCVT_B_W           = 32'b110101100000?????????????1010011;
   localparam [31:0] FCVT_B_WU          = 32'b110101100001?????????????1010011;
-  localparam [31:0] FCVT_D_AB          = 32'b010000100011?????000?????1010011;
-  localparam [31:0] FCVT_D_AH          = 32'b010000100010?????000?????1010011;
   localparam [31:0] FCVT_D_B           = 32'b010000100011?????000?????1010011;
   localparam [31:0] FCVT_D_H           = 32'b010000100010?????000?????1010011;
   localparam [31:0] FCVT_D_L           = 32'b110100100010?????????????1010011;
@@ -133,25 +128,18 @@ package riscv_instr;
   localparam [31:0] FCVT_D_W_COPIFT    = 32'b110100100000?????????????0101011;
   localparam [31:0] FCVT_D_WU          = 32'b110100100001?????????????1010011;
   localparam [31:0] FCVT_D_WU_COPIFT   = 32'b110100100001?????????????0101011;
-  localparam [31:0] FCVT_H_AB          = 32'b010001000011?????000?????1010011;
-  localparam [31:0] FCVT_H_AH          = 32'b010001000010?????????????1010011;
   localparam [31:0] FCVT_H_B           = 32'b010001000011?????000?????1010011;
   localparam [31:0] FCVT_H_D           = 32'b010001000001?????????????1010011;
-  localparam [31:0] FCVT_H_H           = 32'b010001000010?????????????1010011;
   localparam [31:0] FCVT_H_L           = 32'b110101000010?????????????1010011;
   localparam [31:0] FCVT_H_LU          = 32'b110101000011?????????????1010011;
   localparam [31:0] FCVT_H_S           = 32'b010001000000?????????????1010011;
   localparam [31:0] FCVT_H_W           = 32'b110101000000?????????????1010011;
   localparam [31:0] FCVT_H_WU          = 32'b110101000001?????????????1010011;
-  localparam [31:0] FCVT_L_AB          = 32'b110001100010?????????????1010011;
-  localparam [31:0] FCVT_L_AH          = 32'b110001000010?????????????1010011;
   localparam [31:0] FCVT_L_B           = 32'b110001100010?????????????1010011;
   localparam [31:0] FCVT_L_D           = 32'b110000100010?????????????1010011;
   localparam [31:0] FCVT_L_H           = 32'b110001000010?????????????1010011;
   localparam [31:0] FCVT_L_Q           = 32'b110001100010?????????????1010011;
   localparam [31:0] FCVT_L_S           = 32'b110000000010?????????????1010011;
-  localparam [31:0] FCVT_LU_AB         = 32'b110001100011?????????????1010011;
-  localparam [31:0] FCVT_LU_AH         = 32'b110001000011?????????????1010011;
   localparam [31:0] FCVT_LU_B          = 32'b110001100011?????????????1010011;
   localparam [31:0] FCVT_LU_D          = 32'b110000100011?????????????1010011;
   localparam [31:0] FCVT_LU_H          = 32'b110001000011?????????????1010011;
@@ -163,8 +151,6 @@ package riscv_instr;
   localparam [31:0] FCVT_Q_S           = 32'b010001100000?????????????1010011;
   localparam [31:0] FCVT_Q_W           = 32'b110101100000?????????????1010011;
   localparam [31:0] FCVT_Q_WU          = 32'b110101100001?????????????1010011;
-  localparam [31:0] FCVT_S_AB          = 32'b010000000011?????000?????1010011;
-  localparam [31:0] FCVT_S_AH          = 32'b010000000010?????000?????1010011;
   localparam [31:0] FCVT_S_B           = 32'b010000000011?????000?????1010011;
   localparam [31:0] FCVT_S_D           = 32'b010000000001?????????????1010011;
   localparam [31:0] FCVT_S_H           = 32'b010000000010?????000?????1010011;
@@ -173,22 +159,16 @@ package riscv_instr;
   localparam [31:0] FCVT_S_Q           = 32'b010000000011?????????????1010011;
   localparam [31:0] FCVT_S_W           = 32'b110100000000?????????????1010011;
   localparam [31:0] FCVT_S_WU          = 32'b110100000001?????????????1010011;
-  localparam [31:0] FCVT_W_AB          = 32'b110001100000?????????????1010011;
-  localparam [31:0] FCVT_W_AH          = 32'b110001000000?????????????1010011;
   localparam [31:0] FCVT_W_B           = 32'b110001100000?????????????1010011;
   localparam [31:0] FCVT_W_D           = 32'b110000100000?????????????1010011;
   localparam [31:0] FCVT_W_H           = 32'b110001000000?????????????1010011;
   localparam [31:0] FCVT_W_Q           = 32'b110001100000?????????????1010011;
   localparam [31:0] FCVT_W_S           = 32'b110000000000?????????????1010011;
-  localparam [31:0] FCVT_WU_AB         = 32'b110001100001?????????????1010011;
-  localparam [31:0] FCVT_WU_AH         = 32'b110001000001?????????????1010011;
   localparam [31:0] FCVT_WU_B          = 32'b110001100001?????????????1010011;
   localparam [31:0] FCVT_WU_D          = 32'b110000100001?????????????1010011;
   localparam [31:0] FCVT_WU_H          = 32'b110001000001?????????????1010011;
   localparam [31:0] FCVT_WU_Q          = 32'b110001100001?????????????1010011;
   localparam [31:0] FCVT_WU_S          = 32'b110000000001?????????????1010011;
-  localparam [31:0] FDIV_AB            = 32'b0001111??????????????????1010011;
-  localparam [31:0] FDIV_AH            = 32'b0001110??????????????????1010011;
   localparam [31:0] FDIV_B             = 32'b0001111??????????????????1010011;
   localparam [31:0] FDIV_D             = 32'b0001101??????????????????1010011;
   localparam [31:0] FDIV_H             = 32'b0001110??????????????????1010011;
@@ -196,19 +176,13 @@ package riscv_instr;
   localparam [31:0] FDIV_S             = 32'b0001100??????????????????1010011;
   localparam [31:0] FENCE              = 32'b?????????????????000?????0001111;
   localparam [31:0] FENCE_I            = 32'b?????????????????001?????0001111;
-  localparam [31:0] FEQ_AB             = 32'b1010011??????????010?????1010011;
-  localparam [31:0] FEQ_AH             = 32'b1010010??????????010?????1010011;
   localparam [31:0] FEQ_B              = 32'b1010011??????????010?????1010011;
   localparam [31:0] FEQ_D              = 32'b1010001??????????010?????1010011;
   localparam [31:0] FEQ_H              = 32'b1010010??????????010?????1010011;
   localparam [31:0] FEQ_Q              = 32'b1010011??????????010?????1010011;
   localparam [31:0] FEQ_S              = 32'b1010000??????????010?????1010011;
-  localparam [31:0] FLAB               = 32'b?????????????????000?????0000111;
-  localparam [31:0] FLAH               = 32'b?????????????????001?????0000111;
   localparam [31:0] FLB                = 32'b?????????????????000?????0000111;
   localparam [31:0] FLD                = 32'b?????????????????011?????0000111;
-  localparam [31:0] FLE_AB             = 32'b1010011??????????000?????1010011;
-  localparam [31:0] FLE_AH             = 32'b1010010??????????000?????1010011;
   localparam [31:0] FLE_B              = 32'b1010011??????????000?????1010011;
   localparam [31:0] FLE_D              = 32'b1010001??????????000?????1010011;
   localparam [31:0] FLE_H              = 32'b1010010??????????000?????1010011;
@@ -216,8 +190,6 @@ package riscv_instr;
   localparam [31:0] FLE_S              = 32'b1010000??????????000?????1010011;
   localparam [31:0] FLH                = 32'b?????????????????001?????0000111;
   localparam [31:0] FLQ                = 32'b?????????????????100?????0000111;
-  localparam [31:0] FLT_AB             = 32'b1010011??????????001?????1010011;
-  localparam [31:0] FLT_AH             = 32'b1010010??????????001?????1010011;
   localparam [31:0] FLT_B              = 32'b1010011??????????001?????1010011;
   localparam [31:0] FLT_D              = 32'b1010001??????????001?????1010011;
   localparam [31:0] FLT_D_COPIFT       = 32'b1010001??????????001?????0101011;
@@ -225,96 +197,66 @@ package riscv_instr;
   localparam [31:0] FLT_Q              = 32'b1010011??????????001?????1010011;
   localparam [31:0] FLT_S              = 32'b1010000??????????001?????1010011;
   localparam [31:0] FLW                = 32'b?????????????????010?????0000111;
-  localparam [31:0] FMACEX_S_AB        = 32'b0101011??????????????????1010011;
-  localparam [31:0] FMACEX_S_AH        = 32'b0101010??????????????????1010011;
   localparam [31:0] FMACEX_S_B         = 32'b0101011??????????????????1010011;
   localparam [31:0] FMACEX_S_H         = 32'b0101010??????????????????1010011;
-  localparam [31:0] FMADD_AB           = 32'b?????11??????????????????1000011;
-  localparam [31:0] FMADD_AH           = 32'b?????10??????????????????1000011;
   localparam [31:0] FMADD_B            = 32'b?????11??????????????????1000011;
   localparam [31:0] FMADD_D            = 32'b?????01??????????????????1000011;
   localparam [31:0] FMADD_H            = 32'b?????10??????????????????1000011;
   localparam [31:0] FMADD_Q            = 32'b?????11??????????????????1000011;
   localparam [31:0] FMADD_S            = 32'b?????00??????????????????1000011;
-  localparam [31:0] FMAX_AB            = 32'b0010111??????????001?????1010011;
-  localparam [31:0] FMAX_AH            = 32'b0010110??????????001?????1010011;
   localparam [31:0] FMAX_B             = 32'b0010111??????????001?????1010011;
   localparam [31:0] FMAX_D             = 32'b0010101??????????001?????1010011;
   localparam [31:0] FMAX_H             = 32'b0010110??????????001?????1010011;
   localparam [31:0] FMAX_Q             = 32'b0010111??????????001?????1010011;
   localparam [31:0] FMAX_S             = 32'b0010100??????????001?????1010011;
-  localparam [31:0] FMIN_AB            = 32'b0010111??????????000?????1010011;
-  localparam [31:0] FMIN_AH            = 32'b0010110??????????000?????1010011;
   localparam [31:0] FMIN_B             = 32'b0010111??????????000?????1010011;
   localparam [31:0] FMIN_D             = 32'b0010101??????????000?????1010011;
   localparam [31:0] FMIN_H             = 32'b0010110??????????000?????1010011;
   localparam [31:0] FMIN_Q             = 32'b0010111??????????000?????1010011;
   localparam [31:0] FMIN_S             = 32'b0010100??????????000?????1010011;
-  localparam [31:0] FMSUB_AB           = 32'b?????11??????????????????1000111;
-  localparam [31:0] FMSUB_AH           = 32'b?????10??????????????????1000111;
   localparam [31:0] FMSUB_B            = 32'b?????11??????????????????1000111;
   localparam [31:0] FMSUB_D            = 32'b?????01??????????????????1000111;
   localparam [31:0] FMSUB_H            = 32'b?????10??????????????????1000111;
   localparam [31:0] FMSUB_Q            = 32'b?????11??????????????????1000111;
   localparam [31:0] FMSUB_S            = 32'b?????00??????????????????1000111;
-  localparam [31:0] FMUL_AB            = 32'b0001011??????????????????1010011;
-  localparam [31:0] FMUL_AH            = 32'b0001010??????????????????1010011;
   localparam [31:0] FMUL_B             = 32'b0001011??????????????????1010011;
   localparam [31:0] FMUL_D             = 32'b0001001??????????????????1010011;
   localparam [31:0] FMUL_H             = 32'b0001010??????????????????1010011;
   localparam [31:0] FMUL_Q             = 32'b0001011??????????????????1010011;
   localparam [31:0] FMUL_S             = 32'b0001000??????????????????1010011;
-  localparam [31:0] FMULEX_S_AB        = 32'b0100111??????????????????1010011;
-  localparam [31:0] FMULEX_S_AH        = 32'b0100110??????????????????1010011;
   localparam [31:0] FMULEX_S_B         = 32'b0100111??????????????????1010011;
   localparam [31:0] FMULEX_S_H         = 32'b0100110??????????????????1010011;
-  localparam [31:0] FMV_AB_X           = 32'b111101100000?????000?????1010011;
-  localparam [31:0] FMV_AH_X           = 32'b111101000000?????000?????1010011;
   localparam [31:0] FMV_B_X            = 32'b111101100000?????000?????1010011;
   localparam [31:0] FMV_D_X            = 32'b111100100000?????000?????1010011;
   localparam [31:0] FMV_H_X            = 32'b111101000000?????000?????1010011;
   localparam [31:0] FMV_W_X            = 32'b111100000000?????000?????1010011;
-  localparam [31:0] FMV_X_AB           = 32'b111001100000?????000?????1010011;
-  localparam [31:0] FMV_X_AH           = 32'b111001000000?????000?????1010011;
   localparam [31:0] FMV_X_B            = 32'b111001100000?????000?????1010011;
   localparam [31:0] FMV_X_D            = 32'b111000100000?????000?????1010011;
   localparam [31:0] FMV_X_H            = 32'b111001000000?????000?????1010011;
   localparam [31:0] FMV_X_W            = 32'b111000000000?????000?????1010011;
-  localparam [31:0] FNMADD_AB          = 32'b?????11??????????????????1001111;
-  localparam [31:0] FNMADD_AH          = 32'b?????10??????????????????1001111;
   localparam [31:0] FNMADD_B           = 32'b?????11??????????????????1001111;
   localparam [31:0] FNMADD_D           = 32'b?????01??????????????????1001111;
   localparam [31:0] FNMADD_H           = 32'b?????10??????????????????1001111;
   localparam [31:0] FNMADD_Q           = 32'b?????11??????????????????1001111;
   localparam [31:0] FNMADD_S           = 32'b?????00??????????????????1001111;
-  localparam [31:0] FNMSUB_AB          = 32'b?????11??????????????????1001011;
-  localparam [31:0] FNMSUB_AH          = 32'b?????10??????????????????1001011;
   localparam [31:0] FNMSUB_B           = 32'b?????11??????????????????1001011;
   localparam [31:0] FNMSUB_D           = 32'b?????01??????????????????1001011;
   localparam [31:0] FNMSUB_H           = 32'b?????10??????????????????1001011;
   localparam [31:0] FNMSUB_Q           = 32'b?????11??????????????????1001011;
   localparam [31:0] FNMSUB_S           = 32'b?????00??????????????????1001011;
   localparam [31:0] FREP_O             = 32'b????????????????????????10001011;
-  localparam [31:0] FSAB               = 32'b?????????????????000?????0100111;
-  localparam [31:0] FSAH               = 32'b?????????????????001?????0100111;
   localparam [31:0] FSB                = 32'b?????????????????000?????0100111;
   localparam [31:0] FSD                = 32'b?????????????????011?????0100111;
-  localparam [31:0] FSGNJ_AB           = 32'b0010011??????????000?????1010011;
-  localparam [31:0] FSGNJ_AH           = 32'b0010010??????????000?????1010011;
   localparam [31:0] FSGNJ_B            = 32'b0010011??????????000?????1010011;
   localparam [31:0] FSGNJ_D            = 32'b0010001??????????000?????1010011;
   localparam [31:0] FSGNJ_H            = 32'b0010010??????????000?????1010011;
   localparam [31:0] FSGNJ_Q            = 32'b0010011??????????000?????1010011;
   localparam [31:0] FSGNJ_S            = 32'b0010000??????????000?????1010011;
-  localparam [31:0] FSGNJN_AB          = 32'b0010011??????????001?????1010011;
-  localparam [31:0] FSGNJN_AH          = 32'b0010010??????????001?????1010011;
   localparam [31:0] FSGNJN_B           = 32'b0010011??????????001?????1010011;
   localparam [31:0] FSGNJN_D           = 32'b0010001??????????001?????1010011;
   localparam [31:0] FSGNJN_H           = 32'b0010010??????????001?????1010011;
   localparam [31:0] FSGNJN_Q           = 32'b0010011??????????001?????1010011;
   localparam [31:0] FSGNJN_S           = 32'b0010000??????????001?????1010011;
-  localparam [31:0] FSGNJX_AB          = 32'b0010011??????????010?????1010011;
-  localparam [31:0] FSGNJX_AH          = 32'b0010010??????????010?????1010011;
   localparam [31:0] FSGNJX_B           = 32'b0010011??????????010?????1010011;
   localparam [31:0] FSGNJX_D           = 32'b0010001??????????010?????1010011;
   localparam [31:0] FSGNJX_H           = 32'b0010010??????????010?????1010011;
@@ -323,8 +265,6 @@ package riscv_instr;
   localparam [31:0] FSH                = 32'b?????????????????001?????0100111;
   localparam [31:0] FSL                = 32'b?????10??????????001?????0110011;
   localparam [31:0] FSQ                = 32'b?????????????????100?????0100111;
-  localparam [31:0] FSQRT_AB           = 32'b010111100000?????????????1010011;
-  localparam [31:0] FSQRT_AH           = 32'b010111000000?????????????1010011;
   localparam [31:0] FSQRT_B            = 32'b010111100000?????????????1010011;
   localparam [31:0] FSQRT_D            = 32'b010110100000?????????????1010011;
   localparam [31:0] FSQRT_H            = 32'b010111000000?????????????1010011;
@@ -332,8 +272,6 @@ package riscv_instr;
   localparam [31:0] FSQRT_S            = 32'b010110000000?????????????1010011;
   localparam [31:0] FSR                = 32'b?????10??????????101?????0110011;
   localparam [31:0] FSRI               = 32'b?????1???????????101?????0010011;
-  localparam [31:0] FSUB_AB            = 32'b0000111??????????????????1010011;
-  localparam [31:0] FSUB_AH            = 32'b0000110??????????????????1010011;
   localparam [31:0] FSUB_B             = 32'b0000111??????????????????1010011;
   localparam [31:0] FSUB_D             = 32'b0000101??????????????????1010011;
   localparam [31:0] FSUB_H             = 32'b0000110??????????????????1010011;
@@ -482,21 +420,6 @@ package riscv_instr;
   localparam [31:0] P_FL1              = 32'b000100000000?????001?????0110011;
   localparam [31:0] P_INSERT           = 32'b11???????????????010?????0110011;
   localparam [31:0] P_INSERTR          = 32'b1000000??????????010?????0110011;
-  localparam [31:0] P_LB_IRPOST        = 32'b?????????????????000?????0001011;
-  localparam [31:0] P_LB_RR            = 32'b0000000??????????111?????0000011;
-  localparam [31:0] P_LB_RRPOST        = 32'b0000000??????????111?????0001011;
-  localparam [31:0] P_LBU_IRPOST       = 32'b?????????????????100?????0001011;
-  localparam [31:0] P_LBU_RR           = 32'b0100000??????????111?????0000011;
-  localparam [31:0] P_LBU_RRPOST       = 32'b0100000??????????111?????0001011;
-  localparam [31:0] P_LH_IRPOST        = 32'b?????????????????001?????0001011;
-  localparam [31:0] P_LH_RR            = 32'b0001000??????????111?????0000011;
-  localparam [31:0] P_LH_RRPOST        = 32'b0001000??????????111?????0001011;
-  localparam [31:0] P_LHU_IRPOST       = 32'b?????????????????101?????0001011;
-  localparam [31:0] P_LHU_RR           = 32'b0101000??????????111?????0000011;
-  localparam [31:0] P_LHU_RRPOST       = 32'b0101000??????????111?????0001011;
-  localparam [31:0] P_LW_IRPOST        = 32'b?????????????????010?????0001011;
-  localparam [31:0] P_LW_RR            = 32'b0010000??????????111?????0000011;
-  localparam [31:0] P_LW_RRPOST        = 32'b0010000??????????111?????0001011;
   localparam [31:0] P_MAC              = 32'b0100001??????????000?????0110011;
   localparam [31:0] P_MAX              = 32'b0000010??????????110?????0110011;
   localparam [31:0] P_MAXU             = 32'b0000010??????????111?????0110011;
@@ -504,17 +427,8 @@ package riscv_instr;
   localparam [31:0] P_MINU             = 32'b0000010??????????101?????0110011;
   localparam [31:0] P_MSU              = 32'b0100001??????????001?????0110011;
   localparam [31:0] P_ROR              = 32'b000010000000?????101?????0110011;
-  localparam [31:0] P_SB_IRPOST        = 32'b?????????????????000?????0101011;
-  localparam [31:0] P_SB_RR            = 32'b0000000??????????100?????0100011;
-  localparam [31:0] P_SB_RRPOST        = 32'b0000000??????????100?????0101011;
-  localparam [31:0] P_SH_IRPOST        = 32'b?????????????????001?????0101011;
-  localparam [31:0] P_SH_RR            = 32'b0000000??????????101?????0100011;
-  localparam [31:0] P_SH_RRPOST        = 32'b0000000??????????101?????0101011;
   localparam [31:0] P_SLET             = 32'b0000010??????????010?????0110011;
   localparam [31:0] P_SLETU            = 32'b0000010??????????011?????0110011;
-  localparam [31:0] P_SW_IRPOST        = 32'b?????????????????010?????0101011;
-  localparam [31:0] P_SW_RR            = 32'b0000000??????????110?????0100011;
-  localparam [31:0] P_SW_RRPOST        = 32'b0000000??????????110?????0101011;
   localparam [31:0] PACK               = 32'b0000100??????????100?????0110011;
   localparam [31:0] PACKH              = 32'b0000100??????????111?????0110011;
   localparam [31:0] PACKU              = 32'b0100100??????????100?????0110011;
@@ -807,78 +721,42 @@ package riscv_instr;
   localparam [31:0] VDIV_VX            = 32'b100001???????????110?????1010111;
   localparam [31:0] VDIVU_VV           = 32'b100000???????????010?????1010111;
   localparam [31:0] VDIVU_VX           = 32'b100000???????????110?????1010111;
-  localparam [31:0] VFADD_AB           = 32'b1000001??????????011?????0110011;
-  localparam [31:0] VFADD_AH           = 32'b1000001??????????010?????0110011;
   localparam [31:0] VFADD_B            = 32'b1000001??????????011?????0110011;
   localparam [31:0] VFADD_H            = 32'b1000001??????????010?????0110011;
-  localparam [31:0] VFADD_R_AB         = 32'b1000001??????????111?????0110011;
-  localparam [31:0] VFADD_R_AH         = 32'b1000001??????????110?????0110011;
   localparam [31:0] VFADD_R_B          = 32'b1000001??????????111?????0110011;
   localparam [31:0] VFADD_R_H          = 32'b1000001??????????110?????0110011;
   localparam [31:0] VFADD_R_S          = 32'b1000001??????????100?????0110011;
   localparam [31:0] VFADD_S            = 32'b1000001??????????000?????0110011;
   localparam [31:0] VFADD_VF           = 32'b000000???????????101?????1010111;
   localparam [31:0] VFADD_VV           = 32'b000000???????????001?????1010111;
-  localparam [31:0] VFCLASS_AB         = 32'b100110000001?????011?????0110011;
-  localparam [31:0] VFCLASS_AH         = 32'b100110000001?????010?????0110011;
   localparam [31:0] VFCLASS_B          = 32'b100110000001?????011?????0110011;
   localparam [31:0] VFCLASS_H          = 32'b100110000001?????010?????0110011;
   localparam [31:0] VFCLASS_S          = 32'b100110000001?????000?????0110011;
   localparam [31:0] VFCLASS_V          = 32'b010011??????10000001?????1010111;
-  localparam [31:0] VFCPKA_AB_D        = 32'b1011010??????????011?????0110011;
-  localparam [31:0] VFCPKA_AB_S        = 32'b1011000??????????011?????0110011;
-  localparam [31:0] VFCPKA_AH_D        = 32'b1011010??????????010?????0110011;
-  localparam [31:0] VFCPKA_AH_S        = 32'b1011000??????????010?????0110011;
   localparam [31:0] VFCPKA_B_D         = 32'b1011010??????????011?????0110011;
   localparam [31:0] VFCPKA_B_S         = 32'b1011000??????????011?????0110011;
   localparam [31:0] VFCPKA_H_D         = 32'b1011010??????????010?????0110011;
   localparam [31:0] VFCPKA_H_S         = 32'b1011000??????????010?????0110011;
   localparam [31:0] VFCPKA_S_D         = 32'b1011010??????????000?????0110011;
   localparam [31:0] VFCPKA_S_S         = 32'b1011000??????????000?????0110011;
-  localparam [31:0] VFCPKB_AB_D        = 32'b1011010??????????111?????0110011;
-  localparam [31:0] VFCPKB_AB_S        = 32'b1011000??????????111?????0110011;
-  localparam [31:0] VFCPKB_AH_D        = 32'b1011010??????????110?????0110011;
-  localparam [31:0] VFCPKB_AH_S        = 32'b1011000??????????110?????0110011;
   localparam [31:0] VFCPKB_B_D         = 32'b1011010??????????111?????0110011;
   localparam [31:0] VFCPKB_B_S         = 32'b1011000??????????111?????0110011;
   localparam [31:0] VFCPKB_H_D         = 32'b1011010??????????110?????0110011;
   localparam [31:0] VFCPKB_H_S         = 32'b1011000??????????110?????0110011;
   localparam [31:0] VFCPKB_S_D         = 32'b1011010??????????100?????0110011;
   localparam [31:0] VFCPKB_S_S         = 32'b1011000??????????100?????0110011;
-  localparam [31:0] VFCPKC_AB_D        = 32'b1011011??????????011?????0110011;
-  localparam [31:0] VFCPKC_AB_S        = 32'b1011001??????????011?????0110011;
-  localparam [31:0] VFCPKC_AH_D        = 32'b1011011??????????010?????0110011;
-  localparam [31:0] VFCPKC_AH_S        = 32'b1011001??????????010?????0110011;
   localparam [31:0] VFCPKC_B_D         = 32'b1011011??????????011?????0110011;
   localparam [31:0] VFCPKC_B_S         = 32'b1011001??????????011?????0110011;
   localparam [31:0] VFCPKC_H_D         = 32'b1011011??????????010?????0110011;
   localparam [31:0] VFCPKC_H_S         = 32'b1011001??????????010?????0110011;
   localparam [31:0] VFCPKC_S_D         = 32'b1011011??????????000?????0110011;
   localparam [31:0] VFCPKC_S_S         = 32'b1011001??????????000?????0110011;
-  localparam [31:0] VFCPKD_AB_D        = 32'b1011011??????????111?????0110011;
-  localparam [31:0] VFCPKD_AB_S        = 32'b1011001??????????111?????0110011;
-  localparam [31:0] VFCPKD_AH_D        = 32'b1011011??????????110?????0110011;
-  localparam [31:0] VFCPKD_AH_S        = 32'b1011001??????????110?????0110011;
   localparam [31:0] VFCPKD_B_D         = 32'b1011011??????????111?????0110011;
   localparam [31:0] VFCPKD_B_S         = 32'b1011001??????????111?????0110011;
   localparam [31:0] VFCPKD_H_D         = 32'b1011011??????????110?????0110011;
   localparam [31:0] VFCPKD_H_S         = 32'b1011001??????????110?????0110011;
   localparam [31:0] VFCPKD_S_D         = 32'b1011011??????????100?????0110011;
   localparam [31:0] VFCPKD_S_S         = 32'b1011001??????????100?????0110011;
-  localparam [31:0] VFCVT_AB_AH        = 32'b100110000110?????011?????0110011;
-  localparam [31:0] VFCVT_AB_B         = 32'b100110000111?????011?????0110011;
-  localparam [31:0] VFCVT_AB_H         = 32'b100110000110?????011?????0110011;
-  localparam [31:0] VFCVT_AB_S         = 32'b100110000100?????011?????0110011;
-  localparam [31:0] VFCVT_AB_X         = 32'b100110000011?????011?????0110011;
-  localparam [31:0] VFCVT_AB_XU        = 32'b100110000011?????111?????0110011;
-  localparam [31:0] VFCVT_AH_AB        = 32'b100110000111?????010?????0110011;
-  localparam [31:0] VFCVT_AH_B         = 32'b100110000111?????010?????0110011;
-  localparam [31:0] VFCVT_AH_H         = 32'b100110000101?????010?????0110011;
-  localparam [31:0] VFCVT_AH_S         = 32'b100110000100?????010?????0110011;
-  localparam [31:0] VFCVT_AH_X         = 32'b100110000011?????010?????0110011;
-  localparam [31:0] VFCVT_AH_XU        = 32'b100110000011?????110?????0110011;
-  localparam [31:0] VFCVT_B_AB         = 32'b100110000111?????011?????0110011;
-  localparam [31:0] VFCVT_B_AH         = 32'b100110000110?????011?????0110011;
   localparam [31:0] VFCVT_B_B          = 32'b100110000111?????011?????0110011;
   localparam [31:0] VFCVT_B_H          = 32'b100110000110?????011?????0110011;
   localparam [31:0] VFCVT_B_S          = 32'b100110000100?????011?????0110011;
@@ -887,8 +765,6 @@ package riscv_instr;
   localparam [31:0] VFCVT_D_S          = 32'b100110000100?????001?????0110011;
   localparam [31:0] VFCVT_F_X_V        = 32'b010010??????00011001?????1010111;
   localparam [31:0] VFCVT_F_XU_V       = 32'b010010??????00010001?????1010111;
-  localparam [31:0] VFCVT_H_AB         = 32'b100110000111?????010?????0110011;
-  localparam [31:0] VFCVT_H_AH         = 32'b100110000101?????010?????0110011;
   localparam [31:0] VFCVT_H_B          = 32'b100110000111?????010?????0110011;
   localparam [31:0] VFCVT_H_H          = 32'b100110000101?????010?????0110011;
   localparam [31:0] VFCVT_H_S          = 32'b100110000100?????010?????0110011;
@@ -896,128 +772,72 @@ package riscv_instr;
   localparam [31:0] VFCVT_H_XU         = 32'b100110000011?????110?????0110011;
   localparam [31:0] VFCVT_RTZ_X_F_V    = 32'b010010??????00111001?????1010111;
   localparam [31:0] VFCVT_RTZ_XU_F_V   = 32'b010010??????00110001?????1010111;
-  localparam [31:0] VFCVT_S_AB         = 32'b100110000111?????000?????0110011;
-  localparam [31:0] VFCVT_S_AH         = 32'b100110000110?????000?????0110011;
   localparam [31:0] VFCVT_S_B          = 32'b100110000111?????000?????0110011;
   localparam [31:0] VFCVT_S_H          = 32'b100110000110?????000?????0110011;
   localparam [31:0] VFCVT_S_X          = 32'b100110000011?????000?????0110011;
   localparam [31:0] VFCVT_S_XU         = 32'b100110000011?????100?????0110011;
-  localparam [31:0] VFCVT_X_AB         = 32'b100110000010?????011?????0110011;
-  localparam [31:0] VFCVT_X_AH         = 32'b100110000010?????010?????0110011;
   localparam [31:0] VFCVT_X_B          = 32'b100110000010?????011?????0110011;
   localparam [31:0] VFCVT_X_F_V        = 32'b010010??????00001001?????1010111;
   localparam [31:0] VFCVT_X_H          = 32'b100110000010?????010?????0110011;
   localparam [31:0] VFCVT_X_S          = 32'b100110000010?????000?????0110011;
-  localparam [31:0] VFCVT_XU_AB        = 32'b100110000010?????111?????0110011;
-  localparam [31:0] VFCVT_XU_AH        = 32'b100110000010?????110?????0110011;
   localparam [31:0] VFCVT_XU_B         = 32'b100110000010?????111?????0110011;
   localparam [31:0] VFCVT_XU_F_V       = 32'b010010??????00000001?????1010111;
   localparam [31:0] VFCVT_XU_H         = 32'b100110000010?????110?????0110011;
   localparam [31:0] VFCVT_XU_S         = 32'b100110000010?????100?????0110011;
-  localparam [31:0] VFCVTU_AB_AH       = 32'b100110000110?????111?????0110011;
-  localparam [31:0] VFCVTU_AB_B        = 32'b100110000111?????111?????0110011;
-  localparam [31:0] VFCVTU_AB_H        = 32'b100110000110?????111?????0110011;
-  localparam [31:0] VFCVTU_AB_S        = 32'b100110000100?????111?????0110011;
-  localparam [31:0] VFCVTU_AH_AB       = 32'b100110000111?????110?????0110011;
-  localparam [31:0] VFCVTU_AH_B        = 32'b100110000111?????110?????0110011;
-  localparam [31:0] VFCVTU_AH_H        = 32'b100110000101?????110?????0110011;
-  localparam [31:0] VFCVTU_AH_S        = 32'b100110000100?????110?????0110011;
-  localparam [31:0] VFCVTU_B_AB        = 32'b100110000111?????111?????0110011;
-  localparam [31:0] VFCVTU_B_AH        = 32'b100110000110?????111?????0110011;
   localparam [31:0] VFCVTU_B_B         = 32'b100110000111?????111?????0110011;
   localparam [31:0] VFCVTU_B_H         = 32'b100110000110?????111?????0110011;
   localparam [31:0] VFCVTU_B_S         = 32'b100110000100?????111?????0110011;
   localparam [31:0] VFCVTU_D_S         = 32'b100110000100?????101?????0110011;
-  localparam [31:0] VFCVTU_H_AB        = 32'b100110000111?????110?????0110011;
-  localparam [31:0] VFCVTU_H_AH        = 32'b100110000101?????110?????0110011;
   localparam [31:0] VFCVTU_H_B         = 32'b100110000111?????110?????0110011;
   localparam [31:0] VFCVTU_H_H         = 32'b100110000101?????110?????0110011;
   localparam [31:0] VFCVTU_H_S         = 32'b100110000100?????110?????0110011;
-  localparam [31:0] VFCVTU_S_AB        = 32'b100110000111?????100?????0110011;
-  localparam [31:0] VFCVTU_S_AH        = 32'b100110000110?????100?????0110011;
   localparam [31:0] VFCVTU_S_B         = 32'b100110000111?????100?????0110011;
   localparam [31:0] VFCVTU_S_H         = 32'b100110000110?????100?????0110011;
-  localparam [31:0] VFDIV_AB           = 32'b1000100??????????011?????0110011;
-  localparam [31:0] VFDIV_AH           = 32'b1000100??????????010?????0110011;
   localparam [31:0] VFDIV_B            = 32'b1000100??????????011?????0110011;
   localparam [31:0] VFDIV_H            = 32'b1000100??????????010?????0110011;
-  localparam [31:0] VFDIV_R_AB         = 32'b1000100??????????111?????0110011;
-  localparam [31:0] VFDIV_R_AH         = 32'b1000100??????????110?????0110011;
   localparam [31:0] VFDIV_R_B          = 32'b1000100??????????111?????0110011;
   localparam [31:0] VFDIV_R_H          = 32'b1000100??????????110?????0110011;
   localparam [31:0] VFDIV_R_S          = 32'b1000100??????????100?????0110011;
   localparam [31:0] VFDIV_S            = 32'b1000100??????????000?????0110011;
   localparam [31:0] VFDIV_VF           = 32'b100000???????????101?????1010111;
   localparam [31:0] VFDIV_VV           = 32'b100000???????????001?????1010111;
-  localparam [31:0] VFDOTPEX_AH_AB     = 32'b1001011??????????010?????0110011;
-  localparam [31:0] VFDOTPEX_AH_B      = 32'b1001011??????????010?????0110011;
-  localparam [31:0] VFDOTPEX_AH_R_AB   = 32'b1001011??????????110?????0110011;
-  localparam [31:0] VFDOTPEX_AH_R_B    = 32'b1001011??????????110?????0110011;
-  localparam [31:0] VFDOTPEX_H_AB      = 32'b1001011??????????010?????0110011;
   localparam [31:0] VFDOTPEX_H_B       = 32'b1001011??????????010?????0110011;
-  localparam [31:0] VFDOTPEX_H_R_AB    = 32'b1001011??????????110?????0110011;
   localparam [31:0] VFDOTPEX_H_R_B     = 32'b1001011??????????110?????0110011;
-  localparam [31:0] VFDOTPEX_S_AH      = 32'b1001011??????????000?????0110011;
   localparam [31:0] VFDOTPEX_S_H       = 32'b1001011??????????000?????0110011;
-  localparam [31:0] VFDOTPEX_S_R_AH    = 32'b1001011??????????100?????0110011;
   localparam [31:0] VFDOTPEX_S_R_H     = 32'b1001011??????????100?????0110011;
-  localparam [31:0] VFEQ_AB            = 32'b1010000??????????011?????0110011;
-  localparam [31:0] VFEQ_AH            = 32'b1010000??????????010?????0110011;
   localparam [31:0] VFEQ_B             = 32'b1010000??????????011?????0110011;
   localparam [31:0] VFEQ_H             = 32'b1010000??????????010?????0110011;
-  localparam [31:0] VFEQ_R_AB          = 32'b1010000??????????111?????0110011;
-  localparam [31:0] VFEQ_R_AH          = 32'b1010000??????????110?????0110011;
   localparam [31:0] VFEQ_R_B           = 32'b1010000??????????111?????0110011;
   localparam [31:0] VFEQ_R_H           = 32'b1010000??????????110?????0110011;
   localparam [31:0] VFEQ_R_S           = 32'b1010000??????????100?????0110011;
   localparam [31:0] VFEQ_S             = 32'b1010000??????????000?????0110011;
-  localparam [31:0] VFGE_AB            = 32'b1010011??????????011?????0110011;
-  localparam [31:0] VFGE_AH            = 32'b1010011??????????010?????0110011;
   localparam [31:0] VFGE_B             = 32'b1010011??????????011?????0110011;
   localparam [31:0] VFGE_H             = 32'b1010011??????????010?????0110011;
-  localparam [31:0] VFGE_R_AB          = 32'b1010011??????????111?????0110011;
-  localparam [31:0] VFGE_R_AH          = 32'b1010011??????????110?????0110011;
   localparam [31:0] VFGE_R_B           = 32'b1010011??????????111?????0110011;
   localparam [31:0] VFGE_R_H           = 32'b1010011??????????110?????0110011;
   localparam [31:0] VFGE_R_S           = 32'b1010011??????????100?????0110011;
   localparam [31:0] VFGE_S             = 32'b1010011??????????000?????0110011;
-  localparam [31:0] VFGT_AB            = 32'b1010101??????????011?????0110011;
-  localparam [31:0] VFGT_AH            = 32'b1010101??????????010?????0110011;
   localparam [31:0] VFGT_B             = 32'b1010101??????????011?????0110011;
   localparam [31:0] VFGT_H             = 32'b1010101??????????010?????0110011;
-  localparam [31:0] VFGT_R_AB          = 32'b1010101??????????111?????0110011;
-  localparam [31:0] VFGT_R_AH          = 32'b1010101??????????110?????0110011;
   localparam [31:0] VFGT_R_B           = 32'b1010101??????????111?????0110011;
   localparam [31:0] VFGT_R_H           = 32'b1010101??????????110?????0110011;
   localparam [31:0] VFGT_R_S           = 32'b1010101??????????100?????0110011;
   localparam [31:0] VFGT_S             = 32'b1010101??????????000?????0110011;
   localparam [31:0] VFIRST_M           = 32'b010000??????10001010?????1010111;
-  localparam [31:0] VFLE_AB            = 32'b1010100??????????011?????0110011;
-  localparam [31:0] VFLE_AH            = 32'b1010100??????????010?????0110011;
   localparam [31:0] VFLE_B             = 32'b1010100??????????011?????0110011;
   localparam [31:0] VFLE_H             = 32'b1010100??????????010?????0110011;
-  localparam [31:0] VFLE_R_AB          = 32'b1010100??????????111?????0110011;
-  localparam [31:0] VFLE_R_AH          = 32'b1010100??????????110?????0110011;
   localparam [31:0] VFLE_R_B           = 32'b1010100??????????111?????0110011;
   localparam [31:0] VFLE_R_H           = 32'b1010100??????????110?????0110011;
   localparam [31:0] VFLE_R_S           = 32'b1010100??????????100?????0110011;
   localparam [31:0] VFLE_S             = 32'b1010100??????????000?????0110011;
-  localparam [31:0] VFLT_AB            = 32'b1010010??????????011?????0110011;
-  localparam [31:0] VFLT_AH            = 32'b1010010??????????010?????0110011;
   localparam [31:0] VFLT_B             = 32'b1010010??????????011?????0110011;
   localparam [31:0] VFLT_H             = 32'b1010010??????????010?????0110011;
-  localparam [31:0] VFLT_R_AB          = 32'b1010010??????????111?????0110011;
-  localparam [31:0] VFLT_R_AH          = 32'b1010010??????????110?????0110011;
   localparam [31:0] VFLT_R_B           = 32'b1010010??????????111?????0110011;
   localparam [31:0] VFLT_R_H           = 32'b1010010??????????110?????0110011;
   localparam [31:0] VFLT_R_S           = 32'b1010010??????????100?????0110011;
   localparam [31:0] VFLT_S             = 32'b1010010??????????000?????0110011;
-  localparam [31:0] VFMAC_AB           = 32'b1001000??????????011?????0110011;
-  localparam [31:0] VFMAC_AH           = 32'b1001000??????????010?????0110011;
   localparam [31:0] VFMAC_B            = 32'b1001000??????????011?????0110011;
   localparam [31:0] VFMAC_H            = 32'b1001000??????????010?????0110011;
-  localparam [31:0] VFMAC_R_AB         = 32'b1001000??????????111?????0110011;
-  localparam [31:0] VFMAC_R_AH         = 32'b1001000??????????110?????0110011;
   localparam [31:0] VFMAC_R_B          = 32'b1001000??????????111?????0110011;
   localparam [31:0] VFMAC_R_H          = 32'b1001000??????????110?????0110011;
   localparam [31:0] VFMAC_R_S          = 32'b1001000??????????100?????0110011;
@@ -1026,12 +846,8 @@ package riscv_instr;
   localparam [31:0] VFMACC_VV          = 32'b101100???????????001?????1010111;
   localparam [31:0] VFMADD_VF          = 32'b101000???????????101?????1010111;
   localparam [31:0] VFMADD_VV          = 32'b101000???????????001?????1010111;
-  localparam [31:0] VFMAX_AB           = 32'b1000110??????????011?????0110011;
-  localparam [31:0] VFMAX_AH           = 32'b1000110??????????010?????0110011;
   localparam [31:0] VFMAX_B            = 32'b1000110??????????011?????0110011;
   localparam [31:0] VFMAX_H            = 32'b1000110??????????010?????0110011;
-  localparam [31:0] VFMAX_R_AB         = 32'b1000110??????????111?????0110011;
-  localparam [31:0] VFMAX_R_AH         = 32'b1000110??????????110?????0110011;
   localparam [31:0] VFMAX_R_B          = 32'b1000110??????????111?????0110011;
   localparam [31:0] VFMAX_R_H          = 32'b1000110??????????110?????0110011;
   localparam [31:0] VFMAX_R_S          = 32'b1000110??????????100?????0110011;
@@ -1039,24 +855,16 @@ package riscv_instr;
   localparam [31:0] VFMAX_VF           = 32'b000110???????????101?????1010111;
   localparam [31:0] VFMAX_VV           = 32'b000110???????????001?????1010111;
   localparam [31:0] VFMERGE_VFM        = 32'b0101110??????????101?????1010111;
-  localparam [31:0] VFMIN_AB           = 32'b1000101??????????011?????0110011;
-  localparam [31:0] VFMIN_AH           = 32'b1000101??????????010?????0110011;
   localparam [31:0] VFMIN_B            = 32'b1000101??????????011?????0110011;
   localparam [31:0] VFMIN_H            = 32'b1000101??????????010?????0110011;
-  localparam [31:0] VFMIN_R_AB         = 32'b1000101??????????111?????0110011;
-  localparam [31:0] VFMIN_R_AH         = 32'b1000101??????????110?????0110011;
   localparam [31:0] VFMIN_R_B          = 32'b1000101??????????111?????0110011;
   localparam [31:0] VFMIN_R_H          = 32'b1000101??????????110?????0110011;
   localparam [31:0] VFMIN_R_S          = 32'b1000101??????????100?????0110011;
   localparam [31:0] VFMIN_S            = 32'b1000101??????????000?????0110011;
   localparam [31:0] VFMIN_VF           = 32'b000100???????????101?????1010111;
   localparam [31:0] VFMIN_VV           = 32'b000100???????????001?????1010111;
-  localparam [31:0] VFMRE_AB           = 32'b1001001??????????011?????0110011;
-  localparam [31:0] VFMRE_AH           = 32'b1001001??????????010?????0110011;
   localparam [31:0] VFMRE_B            = 32'b1001001??????????011?????0110011;
   localparam [31:0] VFMRE_H            = 32'b1001001??????????010?????0110011;
-  localparam [31:0] VFMRE_R_AB         = 32'b1001001??????????111?????0110011;
-  localparam [31:0] VFMRE_R_AH         = 32'b1001001??????????110?????0110011;
   localparam [31:0] VFMRE_R_B          = 32'b1001001??????????111?????0110011;
   localparam [31:0] VFMRE_R_H          = 32'b1001001??????????110?????0110011;
   localparam [31:0] VFMRE_R_S          = 32'b1001001??????????100?????0110011;
@@ -1065,28 +873,20 @@ package riscv_instr;
   localparam [31:0] VFMSAC_VV          = 32'b101110???????????001?????1010111;
   localparam [31:0] VFMSUB_VF          = 32'b101010???????????101?????1010111;
   localparam [31:0] VFMSUB_VV          = 32'b101010???????????001?????1010111;
-  localparam [31:0] VFMUL_AB           = 32'b1000011??????????011?????0110011;
-  localparam [31:0] VFMUL_AH           = 32'b1000011??????????010?????0110011;
   localparam [31:0] VFMUL_B            = 32'b1000011??????????011?????0110011;
   localparam [31:0] VFMUL_H            = 32'b1000011??????????010?????0110011;
-  localparam [31:0] VFMUL_R_AB         = 32'b1000011??????????111?????0110011;
-  localparam [31:0] VFMUL_R_AH         = 32'b1000011??????????110?????0110011;
   localparam [31:0] VFMUL_R_B          = 32'b1000011??????????111?????0110011;
   localparam [31:0] VFMUL_R_H          = 32'b1000011??????????110?????0110011;
   localparam [31:0] VFMUL_R_S          = 32'b1000011??????????100?????0110011;
   localparam [31:0] VFMUL_S            = 32'b1000011??????????000?????0110011;
   localparam [31:0] VFMUL_VF           = 32'b100100???????????101?????1010111;
   localparam [31:0] VFMUL_VV           = 32'b100100???????????001?????1010111;
-  localparam [31:0] VFMV_AB_X          = 32'b100110000000?????111?????0110011;
-  localparam [31:0] VFMV_AH_X          = 32'b100110000000?????110?????0110011;
   localparam [31:0] VFMV_B_X           = 32'b100110000000?????111?????0110011;
   localparam [31:0] VFMV_F_S           = 32'b0100001?????00000001?????1010111;
   localparam [31:0] VFMV_H_X           = 32'b100110000000?????110?????0110011;
   localparam [31:0] VFMV_S_F           = 32'b010000100000?????101?????1010111;
   localparam [31:0] VFMV_S_X           = 32'b100110000000?????100?????0110011;
   localparam [31:0] VFMV_V_F           = 32'b010111100000?????101?????1010111;
-  localparam [31:0] VFMV_X_AB          = 32'b100110000000?????011?????0110011;
-  localparam [31:0] VFMV_X_AH          = 32'b100110000000?????010?????0110011;
   localparam [31:0] VFMV_X_B           = 32'b100110000000?????011?????0110011;
   localparam [31:0] VFMV_X_H           = 32'b100110000000?????010?????0110011;
   localparam [31:0] VFMV_X_S           = 32'b100110000000?????000?????0110011;
@@ -1098,24 +898,12 @@ package riscv_instr;
   localparam [31:0] VFNCVT_RTZ_XU_F_W  = 32'b010010??????10110001?????1010111;
   localparam [31:0] VFNCVT_X_F_W       = 32'b010010??????10001001?????1010111;
   localparam [31:0] VFNCVT_XU_F_W      = 32'b010010??????10000001?????1010111;
-  localparam [31:0] VFNDOTPEX_AH_AB    = 32'b1011101??????????010?????0110011;
-  localparam [31:0] VFNDOTPEX_AH_B     = 32'b1011101??????????010?????0110011;
-  localparam [31:0] VFNDOTPEX_AH_R_AB  = 32'b1011101??????????110?????0110011;
-  localparam [31:0] VFNDOTPEX_AH_R_B   = 32'b1011101??????????110?????0110011;
-  localparam [31:0] VFNDOTPEX_H_AB     = 32'b1011101??????????010?????0110011;
   localparam [31:0] VFNDOTPEX_H_B      = 32'b1011101??????????010?????0110011;
-  localparam [31:0] VFNDOTPEX_H_R_AB   = 32'b1011101??????????110?????0110011;
   localparam [31:0] VFNDOTPEX_H_R_B    = 32'b1011101??????????110?????0110011;
-  localparam [31:0] VFNDOTPEX_S_AH     = 32'b1011101??????????000?????0110011;
   localparam [31:0] VFNDOTPEX_S_H      = 32'b1011101??????????000?????0110011;
-  localparam [31:0] VFNDOTPEX_S_R_AH   = 32'b1011101??????????100?????0110011;
   localparam [31:0] VFNDOTPEX_S_R_H    = 32'b1011101??????????100?????0110011;
-  localparam [31:0] VFNE_AB            = 32'b1010001??????????011?????0110011;
-  localparam [31:0] VFNE_AH            = 32'b1010001??????????010?????0110011;
   localparam [31:0] VFNE_B             = 32'b1010001??????????011?????0110011;
   localparam [31:0] VFNE_H             = 32'b1010001??????????010?????0110011;
-  localparam [31:0] VFNE_R_AB          = 32'b1010001??????????111?????0110011;
-  localparam [31:0] VFNE_R_AH          = 32'b1010001??????????110?????0110011;
   localparam [31:0] VFNE_R_B           = 32'b1010001??????????111?????0110011;
   localparam [31:0] VFNE_R_H           = 32'b1010001??????????110?????0110011;
   localparam [31:0] VFNE_R_S           = 32'b1010001??????????100?????0110011;
@@ -1128,16 +916,10 @@ package riscv_instr;
   localparam [31:0] VFNMSAC_VV         = 32'b101111???????????001?????1010111;
   localparam [31:0] VFNMSUB_VF         = 32'b101011???????????101?????1010111;
   localparam [31:0] VFNMSUB_VV         = 32'b101011???????????001?????1010111;
-  localparam [31:0] VFNSUM_AB          = 32'b101011100111?????011?????0110011;
-  localparam [31:0] VFNSUM_AH          = 32'b101011111110?????010?????0110011;
   localparam [31:0] VFNSUM_B           = 32'b101011100111?????011?????0110011;
   localparam [31:0] VFNSUM_H           = 32'b101011111110?????010?????0110011;
   localparam [31:0] VFNSUM_S           = 32'b101011111100?????000?????0110011;
-  localparam [31:0] VFNSUMEX_AH_AB     = 32'b101011110111?????010?????0110011;
-  localparam [31:0] VFNSUMEX_AH_B      = 32'b101011110111?????010?????0110011;
-  localparam [31:0] VFNSUMEX_H_AB      = 32'b101011110111?????010?????0110011;
   localparam [31:0] VFNSUMEX_H_B       = 32'b101011110111?????010?????0110011;
-  localparam [31:0] VFNSUMEX_S_AH      = 32'b101011110110?????000?????0110011;
   localparam [31:0] VFNSUMEX_S_H       = 32'b101011110110?????000?????0110011;
   localparam [31:0] VFRDIV_VF          = 32'b100001???????????101?????1010111;
   localparam [31:0] VFREC7_V           = 32'b010011??????00101001?????1010111;
@@ -1147,36 +929,24 @@ package riscv_instr;
   localparam [31:0] VFREDUSUM_VS       = 32'b000001???????????001?????1010111;
   localparam [31:0] VFRSQRT7_V         = 32'b010011??????00100001?????1010111;
   localparam [31:0] VFRSUB_VF          = 32'b100111???????????101?????1010111;
-  localparam [31:0] VFSGNJ_AB          = 32'b1001101??????????011?????0110011;
-  localparam [31:0] VFSGNJ_AH          = 32'b1001101??????????010?????0110011;
   localparam [31:0] VFSGNJ_B           = 32'b1001101??????????011?????0110011;
   localparam [31:0] VFSGNJ_H           = 32'b1001101??????????010?????0110011;
-  localparam [31:0] VFSGNJ_R_AB        = 32'b1001101??????????111?????0110011;
-  localparam [31:0] VFSGNJ_R_AH        = 32'b1001101??????????110?????0110011;
   localparam [31:0] VFSGNJ_R_B         = 32'b1001101??????????111?????0110011;
   localparam [31:0] VFSGNJ_R_H         = 32'b1001101??????????110?????0110011;
   localparam [31:0] VFSGNJ_R_S         = 32'b1001101??????????100?????0110011;
   localparam [31:0] VFSGNJ_S           = 32'b1001101??????????000?????0110011;
   localparam [31:0] VFSGNJ_VF          = 32'b001000???????????101?????1010111;
   localparam [31:0] VFSGNJ_VV          = 32'b001000???????????001?????1010111;
-  localparam [31:0] VFSGNJN_AB         = 32'b1001110??????????011?????0110011;
-  localparam [31:0] VFSGNJN_AH         = 32'b1001110??????????010?????0110011;
   localparam [31:0] VFSGNJN_B          = 32'b1001110??????????011?????0110011;
   localparam [31:0] VFSGNJN_H          = 32'b1001110??????????010?????0110011;
-  localparam [31:0] VFSGNJN_R_AB       = 32'b1001110??????????111?????0110011;
-  localparam [31:0] VFSGNJN_R_AH       = 32'b1001110??????????110?????0110011;
   localparam [31:0] VFSGNJN_R_B        = 32'b1001110??????????111?????0110011;
   localparam [31:0] VFSGNJN_R_H        = 32'b1001110??????????110?????0110011;
   localparam [31:0] VFSGNJN_R_S        = 32'b1001110??????????100?????0110011;
   localparam [31:0] VFSGNJN_S          = 32'b1001110??????????000?????0110011;
   localparam [31:0] VFSGNJN_VF         = 32'b001001???????????101?????1010111;
   localparam [31:0] VFSGNJN_VV         = 32'b001001???????????001?????1010111;
-  localparam [31:0] VFSGNJX_AB         = 32'b1001111??????????011?????0110011;
-  localparam [31:0] VFSGNJX_AH         = 32'b1001111??????????010?????0110011;
   localparam [31:0] VFSGNJX_B          = 32'b1001111??????????011?????0110011;
   localparam [31:0] VFSGNJX_H          = 32'b1001111??????????010?????0110011;
-  localparam [31:0] VFSGNJX_R_AB       = 32'b1001111??????????111?????0110011;
-  localparam [31:0] VFSGNJX_R_AH       = 32'b1001111??????????110?????0110011;
   localparam [31:0] VFSGNJX_R_B        = 32'b1001111??????????111?????0110011;
   localparam [31:0] VFSGNJX_R_H        = 32'b1001111??????????110?????0110011;
   localparam [31:0] VFSGNJX_R_S        = 32'b1001111??????????100?????0110011;
@@ -1185,34 +955,22 @@ package riscv_instr;
   localparam [31:0] VFSGNJX_VV         = 32'b001010???????????001?????1010111;
   localparam [31:0] VFSLIDE1DOWN_VF    = 32'b001111???????????101?????1010111;
   localparam [31:0] VFSLIDE1UP_VF      = 32'b001110???????????101?????1010111;
-  localparam [31:0] VFSQRT_AB          = 32'b100011100000?????011?????0110011;
-  localparam [31:0] VFSQRT_AH          = 32'b100011100000?????010?????0110011;
   localparam [31:0] VFSQRT_B           = 32'b100011100000?????011?????0110011;
   localparam [31:0] VFSQRT_H           = 32'b100011100000?????010?????0110011;
   localparam [31:0] VFSQRT_S           = 32'b100011100000?????000?????0110011;
   localparam [31:0] VFSQRT_V           = 32'b010011??????00000001?????1010111;
-  localparam [31:0] VFSUB_AB           = 32'b1000010??????????011?????0110011;
-  localparam [31:0] VFSUB_AH           = 32'b1000010??????????010?????0110011;
   localparam [31:0] VFSUB_B            = 32'b1000010??????????011?????0110011;
   localparam [31:0] VFSUB_H            = 32'b1000010??????????010?????0110011;
-  localparam [31:0] VFSUB_R_AB         = 32'b1000010??????????111?????0110011;
-  localparam [31:0] VFSUB_R_AH         = 32'b1000010??????????110?????0110011;
   localparam [31:0] VFSUB_R_B          = 32'b1000010??????????111?????0110011;
   localparam [31:0] VFSUB_R_H          = 32'b1000010??????????110?????0110011;
   localparam [31:0] VFSUB_R_S          = 32'b1000010??????????100?????0110011;
   localparam [31:0] VFSUB_S            = 32'b1000010??????????000?????0110011;
   localparam [31:0] VFSUB_VF           = 32'b000010???????????101?????1010111;
   localparam [31:0] VFSUB_VV           = 32'b000010???????????001?????1010111;
-  localparam [31:0] VFSUM_AB           = 32'b100011100111?????011?????0110011;
-  localparam [31:0] VFSUM_AH           = 32'b100011111110?????010?????0110011;
   localparam [31:0] VFSUM_B            = 32'b100011100111?????011?????0110011;
   localparam [31:0] VFSUM_H            = 32'b100011111110?????010?????0110011;
   localparam [31:0] VFSUM_S            = 32'b100011111100?????000?????0110011;
-  localparam [31:0] VFSUMEX_AH_AB      = 32'b100011110111?????010?????0110011;
-  localparam [31:0] VFSUMEX_AH_B       = 32'b100011110111?????010?????0110011;
-  localparam [31:0] VFSUMEX_H_AB       = 32'b100011110111?????010?????0110011;
   localparam [31:0] VFSUMEX_H_B        = 32'b100011110111?????010?????0110011;
-  localparam [31:0] VFSUMEX_S_AH       = 32'b100011110110?????000?????0110011;
   localparam [31:0] VFSUMEX_S_H        = 32'b100011110110?????000?????0110011;
   localparam [31:0] VFWADD_VF          = 32'b110000???????????101?????1010111;
   localparam [31:0] VFWADD_VV          = 32'b110000???????????001?????1010111;
@@ -1767,16 +1525,6 @@ package riscv_instr;
   localparam logic [11:0] CSR_DPC = 12'h7b1;
   localparam logic [11:0] CSR_DSCRATCH0 = 12'h7b2;
   localparam logic [11:0] CSR_DSCRATCH1 = 12'h7b3;
-  localparam logic [11:0] CSR_SSR = 12'h7c0;
-  localparam logic [11:0] CSR_FPMODE = 12'h7c1;
-  localparam logic [11:0] CSR_BARRIER = 12'h7c2;
-  localparam logic [11:0] CSR_SC = 12'h7c3;
-  localparam logic [11:0] CSR_USER_LOW = 12'h7c4;
-  localparam logic [11:0] CSR_USER_HIGH = 12'h7c5;
-  localparam logic [11:0] CSR_COPIFT = 12'h7c6;
-  localparam logic [11:0] CSR_DUMP = 12'h7c7;
-  localparam logic [11:0] CSR_STACKLIMIT = 12'h7d1;
-  localparam logic [11:0] CSR_FMODE = 12'h800;
   localparam logic [11:0] CSR_MCYCLE = 12'hb00;
   localparam logic [11:0] CSR_MINSTRET = 12'hb02;
   localparam logic [11:0] CSR_MHPMCOUNTER3 = 12'hb03;
@@ -1975,6 +1723,16 @@ package riscv_instr;
   localparam logic [11:0] CSR_MHPMCOUNTER29H = 12'hb9d;
   localparam logic [11:0] CSR_MHPMCOUNTER30H = 12'hb9e;
   localparam logic [11:0] CSR_MHPMCOUNTER31H = 12'hb9f;
+  localparam logic [11:0] CSR_SSR = 12'h7c0;
+  localparam logic [11:0] CSR_SC = 12'h7c3;
+  localparam logic [11:0] CSR_USER_LOW = 12'h7c4;
+  localparam logic [11:0] CSR_USER_HIGH = 12'h7c5;
+  localparam logic [11:0] CSR_FPMODE = 12'h7c1;
+  localparam logic [11:0] CSR_BARRIER = 12'h7c2;
+  localparam logic [11:0] CSR_COPIFT = 12'h7c6;
+  localparam logic [11:0] CSR_DUMP = 12'h7c7;
+  localparam logic [11:0] CSR_STACKLIMIT = 12'h7d1;
+  localparam logic [11:0] CSR_FMODE = 12'h800;
 
   // MXCore custom instructions (opcode custom-3: 1110111)
   localparam logic [31:0] MXDOTP_B0          = 32'b?????????????????000?????1110111;
diff --git a/hw/src/generated/spatz_pkg.sv b/hw/src/generated/spatz_pkg.sv
index a598e9d..712c78f 100644
--- a/hw/src/generated/spatz_pkg.sv
+++ b/hw/src/generated/spatz_pkg.sv
@@ -9,7 +9,7 @@
 package spatz_pkg;
 
   import rvv_pkg::*;
-  import cf_math_pkg::idx_width;
+  import cc_pkg::idx_width;
 
   //////////////////
   //  Parameters  //
diff --git a/hw/src/reorder_buffer.sv b/hw/src/reorder_buffer.sv
index 86eded8..f5919a2 100644
--- a/hw/src/reorder_buffer.sv
+++ b/hw/src/reorder_buffer.sv
@@ -9,7 +9,7 @@
 // must be indexed with an ID that identifies it within the ROB.
 
 module reorder_buffer
-  import cf_math_pkg::idx_width;
+  import cc_pkg::idx_width;
 #(
   parameter int unsigned DataWidth = 0,
   parameter int unsigned NumWords  = 0,
diff --git a/hw/src/spatz.sv b/hw/src/spatz.sv
index 341a36b..ab1be3e 100644
--- a/hw/src/spatz.sv
+++ b/hw/src/spatz.sv
@@ -15,7 +15,7 @@
 
 `define X_INTERFACE
 
-module spatz import spatz_pkg::*; import rvv_pkg::*; import fpnew_pkg::*; #(
+module spatz import spatz_pkg::*; import rvv_pkg::*; import fpnew_pkg::*; import cc_pkg::*; #(
     parameter int                  unsigned NrMemPorts          = 1,
     parameter bit                           RegisterRsp         = 0,
     // Memory request (VLSU)
@@ -163,8 +163,8 @@ module spatz import spatz_pkg::*; import rvv_pkg::*; import fpnew_pkg::*; #(
   // When the responses from EX units are not committed to the VRF,
   // buffers store the metadata to commit to the VRF in later cycles
 
-  logic [$clog2(FpuBufDepth)-1:0] vfu_buf_usage;
-  logic [$clog2(VlsuBufDepth)-1:0] vlsu_buf_usage;
+  logic [cnt_width(FpuBufDepth)-1:0] vfu_buf_usage;
+  logic [cnt_width(VlsuBufDepth)-1:0] vlsu_buf_usage;
 
   typedef struct packed {
     vrf_data_t wdata;
@@ -505,15 +505,15 @@ module spatz import spatz_pkg::*; import rvv_pkg::*; import fpnew_pkg::*; #(
   // Ack 1'b1 to the VFU as long as the buffer is not full
   assign vrf_vfu_wvalid = sb_we[VFU_VD_WD] && !vfu_buf_full;
 
-  fifo_v3 #(
-    .FALL_THROUGH (1'b0        ),
-    .dtype        (vfu_buf_t   ),
-    .DEPTH        (FpuBufDepth )
+  cc_fifo #(
+    .FallThrough (1'b0        ),
+    .data_t        (vfu_buf_t   ),
+    .Depth        (FpuBufDepth )
   ) i_vfu_buf (
     .clk_i      (clk_i                   ),
     .rst_ni     (rst_ni                  ),
+    .clr_i     (1'b0),
     .flush_i    (1'b0                    ),
-    .testmode_i (1'b0                    ),
     .full_o     (vfu_buf_full            ),
     .empty_o    (vfu_buf_empty           ),
     .usage_o    (vfu_buf_usage           ),
@@ -537,15 +537,15 @@ module spatz import spatz_pkg::*; import rvv_pkg::*; import fpnew_pkg::*; #(
   assign vlsu_buf_pop = vrf_wvalid[VLSU_VD_WD1] && !vlsu_buf_empty;
   assign vrf_vlsu_wvalid = sb_we[VLSU_VD_WD1] && !vlsu_buf_full;
 
-  fifo_v3 #(
-    .FALL_THROUGH (1'b0         ),
-    .dtype        (vlsu_buf_t   ),
-    .DEPTH        (VlsuBufDepth )
+  cc_fifo #(
+    .FallThrough (1'b0         ),
+    .data_t        (vlsu_buf_t   ),
+    .Depth        (VlsuBufDepth )
   ) i_vlsu_buf (
     .clk_i      (clk_i                    ),
     .rst_ni     (rst_ni                   ),
+    .clr_i     (1'b0),
     .flush_i    (1'b0                     ),
-    .testmode_i (1'b0                     ),
     .full_o     (vlsu_buf_full            ),
     .empty_o    (vlsu_buf_empty           ),
     .usage_o    (vlsu_buf_usage           ),
diff --git a/hw/src/spatz_controller.sv b/hw/src/spatz_controller.sv
index cc1fe20..76903ad 100644
--- a/hw/src/spatz_controller.sv
+++ b/hw/src/spatz_controller.sv
@@ -199,13 +199,12 @@ module spatz_controller
   logic       req_buffer_ready, req_buffer_valid, req_buffer_pop;
 
   // One element wide instruction buffer
-  fall_through_register #(
-    .T(spatz_req_t)
+  cc_fall_through_register #(
+    .data_t(spatz_req_t)
   ) i_req_buffer (
     .clk_i     (clk_i                ),
     .rst_ni    (rst_ni               ),
     .clr_i     (1'b0                 ),
-    .testmode_i(1'b0                 ),
     .ready_o   (req_buffer_ready     ),
     .valid_o   (req_buffer_valid     ),
     .data_i    (decoder_rsp.spatz_req),
@@ -506,12 +505,13 @@ module spatz_controller
   logic                                   running_insn_full;
   `FF(running_insn_q, running_insn_d, '0)
 
-  find_first_one #(
-    .WIDTH(NrParallelInstructions)
+  cc_lzc #(
+    .Width(NrParallelInstructions),
+    .Mode (cc_pkg::LZC_TRAILING_ZERO_CNT)
   ) i_ffo_next_insn_id (
-    .in_i       (~running_insn_q  ),
-    .first_one_o(next_insn_id     ),
-    .no_ones_o  (running_insn_full)
+    .in_i    (~running_insn_q  ),
+    .cnt_o   (next_insn_id     ),
+    .empty_o (running_insn_full)
   );
 
   // Pop the buffer if we do not have a unit stall
@@ -640,11 +640,12 @@ module spatz_controller
   logic     vfu_rsp_valid;
   logic     vfu_rsp_ready;
 
-  spill_register #(
-    .T(vfu_rsp_t)
+  cc_spill_register #(
+    .data_t(vfu_rsp_t)
   ) i_vfu_scalar_response (
     .clk_i  (clk_i                          ),
     .rst_ni (rst_ni                         ),
+    .clr_i  (1'b0),
     .data_i (vfu_rsp_i                      ),
     .valid_i(vfu_rsp_valid_i && vfu_rsp_i.wb),
     .ready_o(vfu_rsp_ready_o                ),
@@ -656,12 +657,13 @@ module spatz_controller
   logic       rsp_valid_d;
   logic       rsp_ready_d;
   spatz_rsp_t rsp_d;
-  spill_register #(
-    .T     (spatz_rsp_t ),
+  cc_spill_register #(
+    .data_t     (spatz_rsp_t ),
     .Bypass(!RegisterRsp)
   ) i_spatz_rsp_register (
     .clk_i  (clk_i       ),
     .rst_ni (rst_ni      ),
+    .clr_i  (1'b0),
     .data_i (rsp_d       ),
     .valid_i(rsp_valid_d ),
     .ready_o(rsp_ready_d ),
diff --git a/hw/src/spatz_doublebw_vlsu.sv b/hw/src/spatz_doublebw_vlsu.sv
index c54ac40..c3b7b11 100644
--- a/hw/src/spatz_doublebw_vlsu.sv
+++ b/hw/src/spatz_doublebw_vlsu.sv
@@ -13,7 +13,7 @@
 module spatz_doublebw_vlsu
   import spatz_pkg::*;
   import rvv_pkg::*;
-  import cf_math_pkg::idx_width; #(
+  import cc_pkg::idx_width; #(
     parameter int unsigned   NrMemPorts         = 1,
     parameter int unsigned   NrOutstandingLoads = 16,
     // Memory request
@@ -86,11 +86,12 @@ module spatz_doublebw_vlsu
   logic       mem_spatz_req_valid;
   logic       mem_spatz_req_ready;
 
-  spill_register #(
-    .T(spatz_req_t)
+  cc_spill_register #(
+    .data_t(spatz_req_t)
   ) i_operation_queue (
     .clk_i  (clk_i                                          ),
     .rst_ni (rst_ni                                         ),
+    .clr_i  (1'b0),
     .data_i (spatz_req_d                                    ),
     .valid_i(spatz_req_valid_i && spatz_req_i.ex_unit == LSU),
     .ready_o(spatz_req_ready_o                              ),
@@ -218,14 +219,14 @@ module spatz_doublebw_vlsu
         .empty_o  (rob_empty[intf][fu] )
       );
 `else
-      fifo_v3 #(
-        .DATA_WIDTH(ELEN              ),
-        .DEPTH     (NrOutstandingLoads)
+      cc_fifo #(
+        .DataWidth(ELEN              ),
+        .Depth     (NrOutstandingLoads)
       ) i_reorder_buffer (
         .clk_i     (clk_i               ),
         .rst_ni    (rst_ni              ),
+        .clr_i     (1'b0),
         .flush_i   (1'b0                ),
-        .testmode_i(1'b0                ),
         .data_i    (rob_wdata[intf][fu] ),
         .push_i    (rob_push[intf][fu]  ),
         .data_o    (rob_rdata[intf][fu] ),
@@ -263,12 +264,12 @@ module spatz_doublebw_vlsu
 
   for (genvar intf = 0; intf < NrInterfaces; intf++) begin: gen_mem_counters_intf
     for (genvar fu = 0; fu < N_FU; fu++) begin: gen_mem_counters_intf_fu
-      delta_counter #(
-        .WIDTH($bits(vlen_t))
+      cc_delta_counter #(
+        .Width($bits(vlen_t))
       ) i_delta_counter_mem (
         .clk_i     (clk_i                  ),
         .rst_ni    (rst_ni                 ),
-        .clear_i   (1'b0                   ),
+        .clr_i     (1'b0                   ),
         .en_i      (mem_counter_en[intf][fu]   ),
         .load_i    (mem_counter_load[intf][fu] ),
         .down_i    (1'b0                   ), // We always count up
@@ -278,12 +279,12 @@ module spatz_doublebw_vlsu
         .overflow_o(/* Unused */           )
       );
 
-      delta_counter #(
-        .WIDTH($bits(vlen_t))
+      cc_delta_counter #(
+        .Width($bits(vlen_t))
       ) i_delta_counter_mem_idx (
         .clk_i     (clk_i                      ),
         .rst_ni    (rst_ni                     ),
-        .clear_i   (1'b0                       ),
+        .clr_i     (1'b0                       ),
         .en_i      (mem_counter_en[intf][fu]       ),
         .load_i    (mem_counter_load[intf][fu]     ),
         .down_i    (1'b0                       ), // We always count up
@@ -332,15 +333,15 @@ module spatz_doublebw_vlsu
   logic             commit_insn_empty;
   logic             commit_insn_valid;
 
-  fifo_v3 #(
-    .DEPTH       (3                ),
-    .FALL_THROUGH(1'b1             ),
-    .dtype       (commit_metadata_t)
+  cc_fifo #(
+    .Depth       (3                ),
+    .FallThrough(1'b1             ),
+    .data_t       (commit_metadata_t)
   ) i_fifo_commit_insn (
     .clk_i     (clk_i            ),
     .rst_ni    (rst_ni           ),
+    .clr_i     (1'b0),
     .flush_i   (1'b0             ),
-    .testmode_i(1'b0             ),
     .data_i    (commit_insn_d    ),
     .push_i    (commit_insn_push ),
     .full_o    (/* Unused */     ),
@@ -406,12 +407,12 @@ module spatz_doublebw_vlsu
 
   for (genvar intf = 0; intf < NrInterfaces; intf++) begin : gen_vreg_counters_intf
     for (genvar fu = 0; fu < N_FU; fu++) begin : gen_vreg_counters_intf_fu
-      delta_counter #(
-        .WIDTH($bits(vlen_t))
+      cc_delta_counter #(
+        .Width($bits(vlen_t))
       ) i_delta_counter_vreg (
         .clk_i     (clk_i                         ),
         .rst_ni    (rst_ni                        ),
-        .clear_i   (1'b0                          ),
+        .clr_i     (1'b0                          ),
         .en_i      (commit_counter_en[intf][fu]   ),
         .load_i    (commit_counter_load[intf][fu] ),
         .down_i    (1'b0                          ), // We always count up
@@ -617,14 +618,14 @@ module spatz_doublebw_vlsu
   logic [NrInterfaces-1:0] [N_FU-1:0] offset_queue_full;
   for (genvar intf = 0; intf < NrInterfaces; intf++) begin : gen_offset_queue_intf
     for (genvar fu = 0; fu < N_FU; fu++) begin : gen_offset_queue_intf_fu
-      fifo_v3 #(
-        .DATA_WIDTH(int'(MAXEW)       ),
-        .DEPTH     (NrOutstandingLoads)
+      cc_fifo #(
+        .DataWidth(int'(MAXEW)       ),
+        .Depth     (NrOutstandingLoads)
       ) i_offset_queue (
         .clk_i     (clk_i                                                                    ),
         .rst_ni    (rst_ni                                                                   ),
+        .clr_i     (1'b0),
         .flush_i   (1'b0                                                                     ),
-        .testmode_i(1'b0                                                                     ),
         .empty_o   (/* Unused */                                                             ),
         .full_o    (offset_queue_full[intf][fu]                                              ),
         .push_i    (spatz_mem_req_valid[intf][fu] && spatz_mem_req_ready[intf][fu] && mem_is_load),
@@ -659,11 +660,12 @@ module spatz_doublebw_vlsu
   `FF(vrf_commit_bypass_q, vrf_commit_bypass_d, 1'b0)
 
   for (genvar intf = 0; intf < NrInterfaces; intf++) begin : gen_vrf_req_register_intf
-    spill_register #(
-      .T(vrf_req_t)
+    cc_spill_register #(
+      .data_t(vrf_req_t)
     ) i_vrf_req_register (
       .clk_i  (clk_i                ),
       .rst_ni (rst_ni               ),
+      .clr_i  (1'b0),
       .data_i (vrf_req_d[intf]      ),
       .valid_i(vrf_req_valid_d[intf]),
       .ready_o(vrf_req_ready_d[intf]),
@@ -1116,11 +1118,12 @@ module spatz_doublebw_vlsu
     for (genvar fu = 0; fu < N_FU; fu++) begin : gen_mem_req
       localparam int unsigned port = intf * N_FU + fu;
 
-      spill_register #(
-        .T(spatz_mem_req_t)
+      cc_spill_register #(
+        .data_t(spatz_mem_req_t)
       ) i_spatz_mem_req_register (
         .clk_i   (clk_i                          ),
         .rst_ni  (rst_ni                         ),
+        .clr_i  (1'b0),
         .data_i  (spatz_mem_req[intf][fu]        ),
         .valid_i (spatz_mem_req_valid[intf][fu]  ),
         .ready_o (spatz_mem_req_ready[intf][fu]  ),
diff --git a/hw/src/spatz_fpu_sequencer.sv b/hw/src/spatz_fpu_sequencer.sv
index e21eaad..9123bf2 100644
--- a/hw/src/spatz_fpu_sequencer.sv
+++ b/hw/src/spatz_fpu_sequencer.sv
@@ -12,7 +12,7 @@ module spatz_fpu_sequencer
   import spatz_pkg::*;
   import rvv_pkg::*;
   import fpnew_pkg::*;
-  import cf_math_pkg::idx_width; #(
+  import cc_pkg::idx_width; #(
     // Memory request
     parameter type dreq_t            = logic,
     parameter type drsp_t            = logic,
@@ -24,7 +24,7 @@ module spatz_fpu_sequencer
     parameter int unsigned AddrWidth           = 32,
     parameter int unsigned DataWidth           = FLEN,
     parameter int unsigned NumOutstandingLoads = 1,
-    localparam int unsigned IdWidth = cf_math_pkg::idx_width(NumOutstandingLoads)
+    localparam int unsigned IdWidth = cc_pkg::idx_width(NumOutstandingLoads)
   ) (
     input  logic             clk_i,
     input  logic             rst_ni,
@@ -70,7 +70,7 @@ module spatz_fpu_sequencer
   /////////////////
 
   localparam int unsigned NrFPReg     = 32;
-  localparam int unsigned FPRRegWidth = cf_math_pkg::idx_width(NrFPReg);
+  localparam int unsigned FPRRegWidth = cc_pkg::idx_width(NrFPReg);
 
   logic [FPRRegWidth-1:0] fd, fs1, fs2, fs3;
   assign fd  = issue_req_i.data_op[7 + FPRRegWidth - 1:7];
@@ -584,11 +584,11 @@ module spatz_fpu_sequencer
 
   // Number of memory operations in the accelerator
   logic [2:0] acc_mem_cnt_q, acc_mem_cnt_d;
-  `FFARN(acc_mem_cnt_q, acc_mem_cnt_d, '0, clk_i, rst_ni)
+  `FF(acc_mem_cnt_q, acc_mem_cnt_d, '0, clk_i, rst_ni)
 
   // Number of store operations in the accelerator
   logic [2:0] acc_mem_str_cnt_q, acc_mem_str_cnt_d;
-  `FFARN(acc_mem_str_cnt_q, acc_mem_str_cnt_d, '0, clk_i, rst_ni)
+  `FF(acc_mem_str_cnt_q, acc_mem_str_cnt_d, '0, clk_i, rst_ni)
 
   // Is the current instruction a vector load?
   logic is_vector_load;
@@ -686,11 +686,12 @@ module spatz_fpu_sequencer
   logic       fp_move_result_valid_o;
   logic       fp_move_result_ready_i;
 
-  spill_register #(
-    .T(spatz_rsp_t)
+  cc_spill_register #(
+    .data_t(spatz_rsp_t)
   ) i_fp_move_register (
     .clk_i     (clk_i                 ),
     .rst_ni    (rst_ni                ),
+    .clr_i  (1'b0),
     .data_i    (fp_move_result_i      ),
     .valid_i   (fp_move_result_valid_i),
     .ready_o   (fp_move_result_ready_o),
diff --git a/hw/src/spatz_pkg.sv.tpl b/hw/src/spatz_pkg.sv.tpl
index 63a0aa4..3c222ce 100644
--- a/hw/src/spatz_pkg.sv.tpl
+++ b/hw/src/spatz_pkg.sv.tpl
@@ -11,7 +11,7 @@ ${int(getattr(cfg['cores'][0]['isa_parsed'], isa))}\
 package spatz_pkg;
 
   import rvv_pkg::*;
-  import cf_math_pkg::idx_width;
+  import cc_pkg::idx_width;
 
   //////////////////
   //  Parameters  //
diff --git a/hw/src/spatz_serdiv.sv b/hw/src/spatz_serdiv.sv
index 722c874..5127945 100644
--- a/hw/src/spatz_serdiv.sv
+++ b/hw/src/spatz_serdiv.sv
@@ -93,18 +93,18 @@ module spatz_serdiv #(
   assign lzc_a_input = (signed_op & op_a_sign) ? {~op_a_i, 1'b0} : op_a_i;
   assign lzc_b_input = (signed_op & op_b_sign) ? ~op_b_i         : op_b_i;
 
-  lzc #(
-    .MODE  ( 1     ), // count leading zeros
-    .WIDTH ( WIDTH )
+  cc_lzc #(
+    .Mode  ( cc_pkg::LZC_LEADING_ZERO_CNT ), // count leading zeros
+    .Width ( WIDTH )
   ) i_lzc_a (
     .in_i    ( lzc_a_input  ),
     .cnt_o   ( lzc_a_result ),
     .empty_o ( lzc_a_no_one )
   );
 
-  lzc #(
-    .MODE  ( 1     ), // count leading zeros
-    .WIDTH ( WIDTH )
+  cc_lzc #(
+    .Mode  ( cc_pkg::LZC_LEADING_ZERO_CNT ), // count leading zeros
+    .Width ( WIDTH )
   ) i_lzc_b (
     .in_i    ( lzc_b_input  ),
     .cnt_o   ( lzc_b_result ),
diff --git a/hw/src/spatz_vfu.sv b/hw/src/spatz_vfu.sv
index 4c26d09..c394f6e 100644
--- a/hw/src/spatz_vfu.sv
+++ b/hw/src/spatz_vfu.sv
@@ -11,7 +11,7 @@
 module spatz_vfu
   import spatz_pkg::*;
   import rvv_pkg::*;
-  import cf_math_pkg::idx_width;
+  import cc_pkg::idx_width;
   import fpnew_pkg::*; #(
     /// FPU configuration.
     parameter fpu_implementation_t FPUImplementation = fpu_implementation_t'(0)
@@ -73,11 +73,12 @@ module spatz_vfu
   logic       spatz_req_valid;
   logic       spatz_req_ready;
 
-  spill_register #(
-    .T(spatz_req_t)
+  cc_spill_register #(
+    .data_t(spatz_req_t)
   ) i_operation_queue (
     .clk_i  (clk_i                                          ),
     .rst_ni (rst_ni                                         ),
+    .clr_i  (1'b0),
     .data_i (spatz_req_i                                    ),
     .valid_i(spatz_req_valid_i && spatz_req_i.ex_unit == VFU),
     .ready_o(spatz_req_ready_o                              ),
diff --git a/hw/src/spatz_vlsu.sv b/hw/src/spatz_vlsu.sv
index 5a6b7b6..cf71a63 100644
--- a/hw/src/spatz_vlsu.sv
+++ b/hw/src/spatz_vlsu.sv
@@ -10,7 +10,7 @@
 module spatz_vlsu
   import spatz_pkg::*;
   import rvv_pkg::*;
-  import cf_math_pkg::idx_width; #(
+  import cc_pkg::idx_width; #(
     parameter int unsigned   NrMemPorts         = 1,
     parameter int unsigned   NrOutstandingLoads = 8,
     // Memory request
@@ -79,11 +79,12 @@ module spatz_vlsu
   logic       mem_spatz_req_valid;
   logic       mem_spatz_req_ready;
 
-  spill_register #(
-    .T(spatz_req_t)
+  cc_spill_register #(
+    .data_t(spatz_req_t)
   ) i_operation_queue (
     .clk_i  (clk_i                                          ),
     .rst_ni (rst_ni                                         ),
+    .clr_i  (1'b0),
     .data_i (spatz_req_d                                    ),
     .valid_i(spatz_req_valid_i && spatz_req_i.ex_unit == LSU),
     .ready_o(spatz_req_ready_o                              ),
@@ -203,14 +204,14 @@ module spatz_vlsu
       .empty_o  (rob_empty[port] )
     );
 `else
-    fifo_v3 #(
-      .DATA_WIDTH(ELEN              ),
-      .DEPTH     (NrOutstandingLoads)
+    cc_fifo #(
+      .DataWidth(ELEN              ),
+      .Depth     (NrOutstandingLoads)
     ) i_reorder_buffer (
       .clk_i     (clk_i           ),
       .rst_ni    (rst_ni          ),
+      .clr_i     (1'b0),
       .flush_i   (1'b0            ),
-      .testmode_i(1'b0            ),
       .data_i    (rob_wdata[port] ),
       .push_i    (rob_push[port]  ),
       .data_o    (rob_rdata[port] ),
@@ -246,12 +247,12 @@ module spatz_vlsu
   vlen_t [NrMemPorts-1:0] mem_idx_counter_q;
 
   for (genvar port = 0; port < NrMemPorts; port++) begin: gen_mem_counters
-    delta_counter #(
-      .WIDTH($bits(vlen_t))
+    cc_delta_counter #(
+      .Width($bits(vlen_t))
     ) i_delta_counter_mem (
       .clk_i     (clk_i                  ),
       .rst_ni    (rst_ni                 ),
-      .clear_i   (1'b0                   ),
+      .clr_i     (1'b0                   ),
       .en_i      (mem_counter_en[port]   ),
       .load_i    (mem_counter_load[port] ),
       .down_i    (1'b0                   ), // We always count up
@@ -261,12 +262,12 @@ module spatz_vlsu
       .overflow_o(/* Unused */           )
     );
 
-    delta_counter #(
-      .WIDTH($bits(vlen_t))
+    cc_delta_counter #(
+      .Width($bits(vlen_t))
     ) i_delta_counter_mem_idx (
       .clk_i     (clk_i                      ),
       .rst_ni    (rst_ni                     ),
-      .clear_i   (1'b0                       ),
+      .clr_i     (1'b0                       ),
       .en_i      (mem_counter_en[port]       ),
       .load_i    (mem_counter_load[port]     ),
       .down_i    (1'b0                       ), // We always count up
@@ -313,15 +314,15 @@ module spatz_vlsu
   logic             commit_insn_empty;
   logic             commit_insn_valid;
 
-  fifo_v3 #(
-    .DEPTH       (NrParallelInstructions),
-    .FALL_THROUGH(1'b1                  ),
-    .dtype       (commit_metadata_t     )
+  cc_fifo #(
+    .Depth       (NrParallelInstructions),
+    .FallThrough(1'b1                  ),
+    .data_t       (commit_metadata_t     )
   ) i_fifo_commit_insn (
     .clk_i     (clk_i            ),
     .rst_ni    (rst_ni           ),
+    .clr_i     (1'b0),
     .flush_i   (1'b0             ),
-    .testmode_i(1'b0             ),
     .data_i    (commit_insn_d    ),
     .push_i    (commit_insn_push ),
     .full_o    (/* Unused */     ),
@@ -386,12 +387,12 @@ module spatz_vlsu
   logic  [NrMemPorts-1:0] commit_finished_d;
 
   for (genvar fu = 0; fu < N_FU; fu++) begin: gen_vreg_counters
-    delta_counter #(
-      .WIDTH($bits(vlen_t))
+    cc_delta_counter #(
+      .Width($bits(vlen_t))
     ) i_delta_counter_vreg (
       .clk_i     (clk_i                   ),
       .rst_ni    (rst_ni                  ),
-      .clear_i   (1'b0                    ),
+      .clr_i     (1'b0                    ),
       .en_i      (commit_counter_en[fu]   ),
       .load_i    (commit_counter_load[fu] ),
       .down_i    (1'b0                    ), // We always count up
@@ -573,14 +574,14 @@ module spatz_vlsu
   addr_offset_t [NrMemPorts-1:0] vreg_addr_offset;
   logic [NrMemPorts-1:0] offset_queue_full;
   for (genvar port = 0; port < NrMemPorts; port++) begin : gen_offset_queue
-    fifo_v3 #(
-      .DATA_WIDTH(int'(MAXEW)       ),
-      .DEPTH     (NrOutstandingLoads)
+    cc_fifo #(
+      .DataWidth(int'(MAXEW)       ),
+      .Depth     (NrOutstandingLoads)
     ) i_offset_queue (
       .clk_i     (clk_i                                                                ),
       .rst_ni    (rst_ni                                                               ),
+      .clr_i     (1'b0),
       .flush_i   (1'b0                                                                 ),
-      .testmode_i(1'b0                                                                 ),
       .empty_o   (/* Unused */                                                         ),
       .full_o    (offset_queue_full[port]                                              ),
       .push_i    (spatz_mem_req_valid[port] && spatz_mem_req_ready[port] && mem_is_load),
@@ -608,11 +609,12 @@ module spatz_vlsu
   logic     vrf_req_valid_d, vrf_req_ready_d;
   logic     vrf_req_valid_q, vrf_req_ready_q;
 
-  spill_register #(
-    .T(vrf_req_t)
+  cc_spill_register #(
+    .data_t(vrf_req_t)
   ) i_vrf_req_register (
     .clk_i  (clk_i          ),
     .rst_ni (rst_ni         ),
+    .clr_i  (1'b0),
     .data_i (vrf_req_d      ),
     .valid_i(vrf_req_valid_d),
     .ready_o(vrf_req_ready_d),
@@ -984,11 +986,12 @@ module spatz_vlsu
 
   // Create memory requests
   for (genvar port = 0; port < NrMemPorts; port++) begin : gen_mem_req
-    spill_register #(
-      .T(spatz_mem_req_t)
+    cc_spill_register #(
+      .data_t(spatz_mem_req_t)
     ) i_spatz_mem_req_register (
       .clk_i   (clk_i                      ),
       .rst_ni  (rst_ni                     ),
+      .clr_i  (1'b0),
       .data_i  (spatz_mem_req[port]        ),
       .valid_i (spatz_mem_req_valid[port]  ),
       .ready_o (spatz_mem_req_ready[port]  ),
diff --git a/hw/src/spatz_vrf.sv b/hw/src/spatz_vrf.sv
index a4efffb..2917966 100644
--- a/hw/src/spatz_vrf.sv
+++ b/hw/src/spatz_vrf.sv
@@ -8,6 +8,7 @@
 
 module spatz_vrf
   import spatz_pkg::*;
+  import cc_pkg::*;
   #(
     parameter int unsigned NrReadPorts  = 5,
     parameter int unsigned NrWritePorts = 3,
@@ -24,7 +25,7 @@ module spatz_vrf
     output logic      [NrWritePorts-1:0] wvalid_o,
 `ifdef BUF_FPU
     // Signal to track if  result can be buffered or not
-    input  logic      [$clog2(FpuBufDepth)-1:0] fpu_buf_usage_i,
+    input  logic      [cnt_width(FpuBufDepth)-1:0] fpu_buf_usage_i,
 `endif
     // Read ports
     input  vrf_addr_t [NrReadPorts-1:0]  raddr_i,
diff --git a/hw/src/spatz_vsldu.sv b/hw/src/spatz_vsldu.sv
index 4d7d8d9..edf46bd 100644
--- a/hw/src/spatz_vsldu.sv
+++ b/hw/src/spatz_vsldu.sv
@@ -9,7 +9,7 @@
 module spatz_vsldu
   import spatz_pkg::*;
   import rvv_pkg::*;
-  import cf_math_pkg::idx_width; (
+  import cc_pkg::idx_width; (
     input  logic             clk_i,
     input  logic             rst_ni,
     // Spatz request
@@ -45,11 +45,12 @@ module spatz_vsldu
   logic       spatz_req_valid;
   logic       spatz_req_ready;
 
-  spill_register #(
-    .T(spatz_req_t)
+  cc_spill_register #(
+    .data_t(spatz_req_t)
   ) i_operation_queue (
     .clk_i  (clk_i                                          ),
     .rst_ni (rst_ni                                         ),
+    .clr_i  (1'b0),
     .data_i (spatz_req_d                                    ),
     .valid_i(spatz_req_valid_i && spatz_req_i.ex_unit == SLD),
     .ready_o(spatz_req_ready_o                              ),
@@ -104,11 +105,12 @@ module spatz_vsldu
   logic     vrf_req_valid_d, vrf_req_ready_d;
   logic     vrf_req_valid_q, vrf_req_ready_q;
 
-  spill_register #(
-    .T(vrf_req_t)
+  cc_spill_register #(
+    .data_t(vrf_req_t)
   ) i_vrf_req_register (
     .clk_i  (clk_i          ),
     .rst_ni (rst_ni         ),
+    .clr_i  (1'b0),
     .data_i (vrf_req_d      ),
     .valid_i(vrf_req_valid_d),
     .ready_o(vrf_req_ready_d),
diff --git a/hw/src/vregfile.sv b/hw/src/vregfile.sv
index aa84eaf..6a44b83 100644
--- a/hw/src/vregfile.sv
+++ b/hw/src/vregfile.sv
@@ -111,7 +111,7 @@ module vregfile import spatz_pkg::*; #(
   // Read data from memory
   for (genvar port = 0; port < NrReadPorts; port++) begin: gen_read_mem
     // Reuse the decision tree from the RR arbiter
-    rr_arb_tree #(
+    cc_rr_arb_tree #(
       .AxiVldRdy(1'b1     ),
       .ExtPrio  (1'b1     ),
       .DataWidth(WordWidth),
@@ -119,7 +119,7 @@ module vregfile import spatz_pkg::*; #(
     ) i_read_tree (
       .clk_i  (clk_i        ),
       .rst_ni (rst_ni       ),
-      .flush_i(1'b0         ),
+      .clr_i  (1'b0         ),
       .idx_o  (/* Unused */ ),
       .data_i (mem          ),
       .rr_i   (raddr_i[port]),

From 98da77501918b53d18b8390ce12b40a96fc19f61 Mon Sep 17 00:00:00 2001
From: Diyou Shen <dishen@iis.ee.ethz.ch>
Date: Thu, 23 Jul 2026 14:12:31 +0200
Subject: [PATCH 2/9] [Bender] Remove unused dependencies

---
 Bender.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Bender.yml b/Bender.yml
index 7c066e8..c27a27a 100644
--- a/Bender.yml
+++ b/Bender.yml
@@ -13,8 +13,6 @@ dependencies:
   common_cells:       { git: "https://github.com/pulp-platform/common_cells.git",       rev: master             }
   FPnew:              { git: "https://github.com/pulp-platform/cvfpu.git",              rev: common-cells-v2    }
   tech_cells_generic: { git: "https://github.com/pulp-platform/tech_cells_generic.git", version: 0.2.14         }
-  snitch:             { path: "hw/ip/snitch"                                                                    }
-  reqrsp_interface:   { path: "hw/ip/reqrsp_interface"                                                          }
 
 workspace:
   checkout_dir: "hw/ip"
@@ -25,7 +23,9 @@ sources:
     files:
     # Level 0
     - hw/ip/snitch/src/riscv_instr.sv
-    - hw/src/reorder_buffer.sv
+    - target: mempool
+      files:
+        - hw/src/reorder_buffer.sv
     - hw/src/rvv_pkg.sv
     # Level 1
     - hw/src/generated/spatz_pkg.sv

From 984b8a24a1d0ba265fe2096262f1091b04e37e0a Mon Sep 17 00:00:00 2001
From: Diyou Shen <dishen@iis.ee.ethz.ch>
Date: Thu, 23 Jul 2026 15:45:55 +0200
Subject: [PATCH 3/9] [CFG] Improve import_cfg.py to support better in snitch
 cluster and add default configuration.

---
 hw/import_cfg.py | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/hw/import_cfg.py b/hw/import_cfg.py
index e46ca2f..84e59c7 100644
--- a/hw/import_cfg.py
+++ b/hw/import_cfg.py
@@ -9,33 +9,40 @@
     print("Usage: python script.py <config.hjson>")
     sys.exit(1)
 
-# get dir to which the output is exported
 script_dir = Path(__file__).parent
 
-# get path of config file
 cfg_source_path = Path(sys.argv[1])
 cfg_name = cfg_source_path.stem   # strip extension; apply_cfg.py appends .hjson
 
+SPATZ_KEYS = ['mempool', 'vlen', 'n_fpu', 'n_ipu', 'spatz_fpu', 'spatz_nports',
+              'double_bw', 'buf_fpu', 'rvf', 'rvd']
+
+DEFAULT_SPATZ_CFG = {
+    'mempool': False,
+    'vlen': 512,
+    'n_fpu': 4,
+    'n_ipu': 1,
+    'spatz_fpu': True,
+    'spatz_nports': 4,
+    'double_bw': False,
+    'buf_fpu': 1,
+    'rvf': True,
+    'rvd': True,
+}
+
 with open(cfg_source_path, "r") as f:
     data = hjson.load(f)
-    
-# copy only relevant information
-spatz_cfg = {'spatz': {}}
-keys = ['mempool', 'vlen', 'n_fpu', 'n_ipu', 'spatz_fpu', 'spatz_nports', 'double_bw', 'buf_fpu', 'rvf', 'rvd']
 
-for k in keys:
-    if k in data['cluster']:
-        spatz_cfg['spatz'][k] = data['cluster'][k]
+cfg = data.get('spatz')
+if not cfg:
+    print(f"[import_cfg] Warning: '{cfg_source_path}' carries no (or an "
+          f"empty) 'spatz' configuration; falling back to defaults.",
+          file=sys.stderr)
+    cfg = DEFAULT_SPATZ_CFG
 
+spatz_cfg = {'spatz': {k: cfg[k] for k in SPATZ_KEYS if k in cfg}}
 
-# dump output into cfg folder (always .hjson so apply_cfg.py can find it)
 cfg_dest_path = script_dir / 'cfg' / (cfg_name + '.hjson')
 cfg_dest_path.parent.mkdir(parents=True, exist_ok=True)
 with open(cfg_dest_path, "w") as f:
     hjson.dump(spatz_cfg, f)
-
-
-
-
-
-

From 8c9e3103eff31832e2303c607eef6fc4a1d43c55 Mon Sep 17 00:00:00 2001
From: Diyou Shen <dishen@iis.ee.ethz.ch>
Date: Sat, 25 Jul 2026 16:01:42 +0200
Subject: [PATCH 4/9] [Util] Add requirements.txt for python dependency.

---
 requirements.txt | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 requirements.txt

diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..2836b1c
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,11 @@
+# Python packages required for hardware code generation (make generate).
+# dataclasses is a stdlib backport needed on Python 3.6; it is a no-op on 3.7+.
+dataclasses
+hjson
+jsonref
+jsonschema
+mako
+termcolor
+# CPU-only torch for data generation scripts (gen_data.py in software/tests/)
+--extra-index-url https://download.pytorch.org/whl/cpu
+torch
\ No newline at end of file

From 733bd3e5321f1d557b20e9e943d0365df7a874bc Mon Sep 17 00:00:00 2001
From: Luca Colagrande <luca.colagrande3@gmail.com>
Date: Sun, 26 Jul 2026 16:29:10 +0200
Subject: [PATCH 5/9] Replace requirements.txt with modern pyproject.toml

---
 pyproject.toml   | 36 ++++++++++++++++++++++++++++++++++++
 requirements.txt | 11 -----------
 2 files changed, 36 insertions(+), 11 deletions(-)
 create mode 100644 pyproject.toml
 delete mode 100644 requirements.txt

diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..19707dd
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,36 @@
+# Copyright 2026 ETH Zurich and University of Bologna.
+# Solderpad Hardware License, Version 0.51, see LICENSE for details.
+# SPDX-License-Identifier: SHL-0.51
+
+[build-system]
+requires = ["setuptools>=64"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "spatz-core"
+description = "Spatz VPU scripts and utilities"
+dynamic = ["version"]
+requires-python = ">=3.11"
+dependencies = [
+    # Alphabetically sorted.
+    "dataclasses",
+    "hjson",
+    "jsonref",
+    "jsonschema",
+    "mako",
+    "termcolor",
+    "torch",
+]
+
+[tool.uv.sources]
+torch = [
+    { index = "pytorch-cpu" },
+]
+
+[[tool.uv.index]]
+name = "pytorch-cpu"
+url = "https://download.pytorch.org/whl/cpu"
+explicit = true
+
+[tool.setuptools]
+packages = []
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 2836b1c..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-# Python packages required for hardware code generation (make generate).
-# dataclasses is a stdlib backport needed on Python 3.6; it is a no-op on 3.7+.
-dataclasses
-hjson
-jsonref
-jsonschema
-mako
-termcolor
-# CPU-only torch for data generation scripts (gen_data.py in software/tests/)
---extra-index-url https://download.pytorch.org/whl/cpu
-torch
\ No newline at end of file

From 0a09d7ea5d2bb2e7844742f2d4bbe3f4874bea97 Mon Sep 17 00:00:00 2001
From: Luca Colagrande <luca.colagrande3@gmail.com>
Date: Sun, 26 Jul 2026 17:20:11 +0200
Subject: [PATCH 6/9] Align Bender and Python package names to `spatz_vpu`

---
 Bender.yml     | 2 +-
 pyproject.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Bender.yml b/Bender.yml
index c27a27a..dc8d5f9 100644
--- a/Bender.yml
+++ b/Bender.yml
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 package:
-  name: spatz_core
+  name: spatz_vpu
   authors:
     - "Matheus Cavalcante <matheusd@iis.ee.ethz.ch>"
     - "Mattia Sinigaglia  <mattia.sinigaglia5@unibo.it>"
diff --git a/pyproject.toml b/pyproject.toml
index 19707dd..6a33ebb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,7 +7,7 @@ requires = ["setuptools>=64"]
 build-backend = "setuptools.build_meta"
 
 [project]
-name = "spatz-core"
+name = "spatz-vpu"
 description = "Spatz VPU scripts and utilities"
 dynamic = ["version"]
 requires-python = ">=3.11"

From 235068cb4481dc15f3f49715450726e8404ecc67 Mon Sep 17 00:00:00 2001
From: Luca Colagrande <luca.colagrande3@gmail.com>
Date: Mon, 27 Jul 2026 14:16:26 +0200
Subject: [PATCH 7/9] Bender.yml: Remove redundant `spatz` target

---
 Bender.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Bender.yml b/Bender.yml
index dc8d5f9..618bccd 100644
--- a/Bender.yml
+++ b/Bender.yml
@@ -19,8 +19,7 @@ workspace:
 
 sources:
   ## hw/ip/spatz ##
-  - target: spatz
-    files:
+  - files:
     # Level 0
     - hw/ip/snitch/src/riscv_instr.sv
     - target: mempool

From dc1986c913f55361610d997d625f2e30812a367e Mon Sep 17 00:00:00 2001
From: Sergio Mazzola <smazzola@iis.ee.ethz.ch>
Date: Fri, 19 Jun 2026 14:33:20 +0200
Subject: [PATCH 8/9] hw: :bug: Fix controller rejecting scalar FP ops before
 vlen was set

---
 hw/src/spatz_controller.sv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/src/spatz_controller.sv b/hw/src/spatz_controller.sv
index 76903ad..4a72ed1 100644
--- a/hw/src/spatz_controller.sv
+++ b/hw/src/spatz_controller.sv
@@ -605,8 +605,8 @@ module spatz_controller
           issue_rsp_o.writeback = spatz_req.use_rd;
         end // CON
         VFU: begin
-          // vtype is illegal -> illegal instruction
-          if (vtype_q.vill) begin
+          // Scalar FP ops use the VFU path but do not depend on the vector vtype CSR.
+          if (vtype_q.vill && !decoder_rsp.spatz_req.op_arith.is_scalar) begin
             issue_rsp_o.accept = 1'b0;
           end
         end // VFU

From a36814897db3e508c7a9c9020ec9d4257371c2cc Mon Sep 17 00:00:00 2001
From: Diyou Shen <dishen@iis.ee.ethz.ch>
Date: Tue, 28 Jul 2026 16:08:51 +0200
Subject: [PATCH 9/9] [Bender][SRC] Re-enable the reqrsp_interface and snitch
 dependency to be used inside snitch cluster and align the package use.

---
 Bender.yml                    | 2 ++
 hw/src/spatz_fpu_sequencer.sv | 4 ++--
 hw/src/spatz_vlsu.sv          | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Bender.yml b/Bender.yml
index 618bccd..9432926 100644
--- a/Bender.yml
+++ b/Bender.yml
@@ -13,6 +13,8 @@ dependencies:
   common_cells:       { git: "https://github.com/pulp-platform/common_cells.git",       rev: master             }
   FPnew:              { git: "https://github.com/pulp-platform/cvfpu.git",              rev: common-cells-v2    }
   tech_cells_generic: { git: "https://github.com/pulp-platform/tech_cells_generic.git", version: 0.2.14         }
+  snitch:             { path: "hw/ip/snitch"                                                                    }
+  reqrsp_interface:   { path: "hw/ip/reqrsp_interface"                                                          }
 
 workspace:
   checkout_dir: "hw/ip"
diff --git a/hw/src/spatz_fpu_sequencer.sv b/hw/src/spatz_fpu_sequencer.sv
index 9123bf2..de9ff27 100644
--- a/hw/src/spatz_fpu_sequencer.sv
+++ b/hw/src/spatz_fpu_sequencer.sv
@@ -517,7 +517,7 @@ module spatz_fpu_sequencer
   logic [AddrWidth-1:0] fp_lsu_qaddr;
   logic [DataWidth-1:0] fp_lsu_qdata;
   logic [1:0]           fp_lsu_qsize;
-  logic [3:0]           fp_lsu_qamo; // Underlying type of snitch_pkg::amo_op_e — update if that typedef changes.
+  snitch_pkg::amo_op_e  fp_lsu_qamo;
   logic fp_lsu_qvalid;
   logic fp_lsu_qready;
 
@@ -636,7 +636,7 @@ module spatz_fpu_sequencer
 `endif
     fp_lsu_qdata   = fpr_rdata[1];
     fp_lsu_qsize   = ls_size;
-    fp_lsu_qamo    = 4'h0; // snitch_pkg::AMONone
+    fp_lsu_qamo    = snitch_pkg::AMONone;
     fp_lsu_qvalid  = (is_load || is_store) && operands_available && !vlsu_stall;
 
     acc_mem_cnt_d     = acc_mem_cnt_q;
diff --git a/hw/src/spatz_vlsu.sv b/hw/src/spatz_vlsu.sv
index cf71a63..7b27306 100644
--- a/hw/src/spatz_vlsu.sv
+++ b/hw/src/spatz_vlsu.sv
@@ -1014,7 +1014,7 @@ module spatz_vlsu
 `else
     assign spatz_mem_req[port] = '{addr:  mem_req_addr[port],
                                    write: !mem_is_load,
-                                   amo:   4'h0, // snitch_pkg::AMONone
+                                   amo:   snitch_pkg::AMONone,
                                    data:  mem_req_data[port],
                                    strb:  mem_req_strb[port],
                                    default: '0};