refactor: migrate to common_cells v2

Author: ricted98

Bender.yml

@@ -4,7 +4,7 @@ package:
 
 dependencies:
   axi: { git: "https://github.com/pulp-platform/axi.git", version: 0.39.9 }
-  common_cells: { git: "https://github.com/pulp-platform/common_cells.git", rev: v2-dev }
+  common_cells: { git: "https://github.com/pulp-platform/common_cells.git", rev: v2-test }
   common_verification: { git: "https://github.com/pulp-platform/common_verification.git", version: 0.2.1 }
 
 sources:

src/axi_res_tbl.sv

@@ -87,7 +87,7 @@ module axi_res_tbl #(
         logic [NUM_RESERVATIONS-1:0] field_in_use_d, field_in_use_q;
 
         cc_plru_tree #(
-            .Entries(NUM_RESERVATIONS)
+            .ENTRIES(NUM_RESERVATIONS)
         ) i_reservation_plru (
             .clk_i(clk_i),
             .rst_ni(rst_ni),
@@ -96,10 +96,10 @@ module axi_res_tbl #(
         );
 
         cc_onehot_to_bin #(
-            .OnehotWidth(NUM_RESERVATIONS)
+            .ONEHOT_WIDTH(NUM_RESERVATIONS)
         ) i_reservation_plru_bin (
-            .onehot_i(plru_evict_oh),
-            .bin_o(plru_evict)
+            .onehot(plru_evict_oh),
+            .bin(plru_evict)
         );
 
         always_comb begin

src/axi_riscv_lrsc.sv

@@ -336,11 +336,11 @@ module axi_riscv_lrsc #(
 
     // IQ Queue to track in-flight reads
     cc_id_queue #(
-        .IdWidth         (AXI_ID_WIDTH),
-        .Capacity        (AXI_MAX_READ_TXNS),
+        .ID_WIDTH         (AXI_ID_WIDTH),
+        .CAPACITY        (AXI_MAX_READ_TXNS),
         .data_t          (r_flight_t),
-        .FullBw          (FULL_BANDWIDTH),
-        .CutOupPopInpGnt (CUT_OUP_POP_INP_GNT)
+        .FULL_BW          (FULL_BANDWIDTH),
+        .CUT_OUP_POP_INP_GNT (CUT_OUP_POP_INP_GNT)
     ) i_read_in_flight_queue (
         .clk_i              (clk_i),
         .rst_ni             (rst_ni),
@@ -366,7 +366,7 @@ module axi_riscv_lrsc #(
 
     // Fork requests from AR into reservation table and queue of in-flight reads.
     cc_stream_fork #(
-        .NumOup  (2)
+        .N_OUP  (2)
     ) i_ar_push_fork (
         .clk_i      (clk_i),
         .rst_ni     (rst_ni),
@@ -497,10 +497,10 @@ module axi_riscv_lrsc #(
 
     // FIFO to track commands for W bursts.
     cc_fifo #(
-        .FallThrough(1'b0), // There would be a combinatorial loop if this were a fall-through
+        .FALL_THROUGH(1'b0), // There would be a combinatorial loop if this were a fall-through
                             // register.  Optimizing this can reduce the latency of this module.
-        .data_t     (w_cmd_t),
-        .Depth      (AXI_MAX_WRITE_TXNS)
+        .dtype     (w_cmd_t),
+        .DEPTH      (AXI_MAX_WRITE_TXNS)
     ) i_w_cmd_fifo (
         .clk_i      (clk_i),
         .rst_ni     (rst_ni),
@@ -522,11 +522,11 @@ module axi_riscv_lrsc #(
     b_cmd_flat_t b_status_inp_cmd_flat, b_status_oup_cmd_flat;
     assign b_status_inp_cmd_flat = b_cmd_flat_t'(b_status_inp_cmd);
     cc_id_queue #(
-        .IdWidth         (AXI_ID_WIDTH),
-        .Capacity        (AXI_MAX_WRITE_TXNS),
+        .ID_WIDTH         (AXI_ID_WIDTH),
+        .CAPACITY        (AXI_MAX_WRITE_TXNS),
         .data_t          (b_cmd_flat_t),
-        .FullBw          (FULL_BANDWIDTH),
-        .CutOupPopInpGnt (CUT_OUP_POP_INP_GNT)
+        .FULL_BW          (FULL_BANDWIDTH),
+        .CUT_OUP_POP_INP_GNT (CUT_OUP_POP_INP_GNT)
     ) i_b_status_queue (
         .clk_i              (clk_i),
         .rst_ni             (rst_ni),
@@ -552,11 +552,11 @@ module axi_riscv_lrsc #(
 
     // ID Queue to track in-flight writes.
     cc_id_queue #(
-        .IdWidth         (AXI_ID_WIDTH),
-        .Capacity        (AXI_MAX_WRITE_TXNS),
+        .ID_WIDTH         (AXI_ID_WIDTH),
+        .CAPACITY        (AXI_MAX_WRITE_TXNS),
         .data_t          (w_flight_t),
-        .FullBw          (FULL_BANDWIDTH),
-        .CutOupPopInpGnt (CUT_OUP_POP_INP_GNT)
+        .FULL_BW          (FULL_BANDWIDTH),
+        .CUT_OUP_POP_INP_GNT (CUT_OUP_POP_INP_GNT)
     ) i_write_in_flight_queue (
         .clk_i              (clk_i),
         .rst_ni             (rst_ni),
@@ -593,8 +593,8 @@ module axi_riscv_lrsc #(
 // pragma translate_on
 
     cc_stream_arbiter #(
-        .data_t (wifq_exists_t),
-        .NumInp (2)
+        .DATA_T (wifq_exists_t),
+        .N_INP (2)
     ) i_wifq_exists_arb (
         .clk_i          (clk_i),
         .rst_ni         (rst_ni),
@@ -607,7 +607,7 @@ module axi_riscv_lrsc #(
     );
 
     cc_stream_fork #(
-        .NumOup  (2)
+        .N_OUP  (2)
     ) i_mst_b_fork (
         .clk_i      (clk_i),
         .rst_ni     (rst_ni),
@@ -619,9 +619,9 @@ module axi_riscv_lrsc #(
 
     // FIFO to track B responses that are to be injected.
     cc_fifo #(
-        .FallThrough   (1'b0),
-        .data_t        (b_inj_t),
-        .Depth         (AXI_MAX_WRITE_TXNS)
+        .FALL_THROUGH   (1'b0),
+        .dtype        (b_inj_t),
+        .DEPTH         (AXI_MAX_WRITE_TXNS)
     ) i_b_inj_fifo (
         .clk_i      (clk_i),
         .rst_ni     (rst_ni),
@@ -661,7 +661,7 @@ module axi_riscv_lrsc #(
 
 
     cc_fall_through_register #(
-        .data_t (aw_chan_t)
+        .T (aw_chan_t)
     ) i_aw_trans_reg (
         .clk_i       (clk_i),
         .rst_ni      (rst_ni),
@@ -986,7 +986,7 @@ module axi_riscv_lrsc #(
 
     // Register in front of slv_b to prevent changes by FSM while valid and not yet ready.
     cc_stream_register #(
-        .data_t  (b_chan_t)
+        .T  (b_chan_t)
     ) slv_b_reg (
         .clk_i      (clk_i),
         .rst_ni     (rst_ni),
@@ -1004,7 +1004,7 @@ module axi_riscv_lrsc #(
     // Fall-through register in front of slv_r to remove mutual dependency.
     cc_spill_register #( // There would be a combinatorial loop if this were a fall-through register.
                       // Optimizing this can reduce the latency of this module.
-        .data_t  (r_chan_t)
+        .T  (r_chan_t)
     ) slv_r_reg (
         .clk_i      (clk_i),
         .rst_ni     (rst_ni),