hw: Collective fix for cc v2

Author: Lore0599

hw/floo_meta_buffer.sv

@@ -142,9 +142,9 @@ module floo_meta_buffer #(
     logic aw_no_atop_buf_not_full, ar_no_atop_buf_not_full;
 
     cc_id_queue #(
-      .ID_WIDTH ( IdMinWidth  ),
-      .CAPACITY ( MaxTxns     ),
-      .FULL_BW  ( 1'b1        ),
+      .IdWidth ( IdMinWidth  ),
+      .Capacity ( MaxTxns     ),
+      .FullBw   ( 1'b1        ),
       .data_t   ( buf_t       )
     ) i_aw_no_atop_id_queue (
       .clk_i,
@@ -167,9 +167,9 @@ module floo_meta_buffer #(
     );
 
     cc_id_queue #(
-      .ID_WIDTH ( IdMinWidth  ),
-      .CAPACITY ( MaxTxns     ),
-      .FULL_BW  ( 1'b1        ),
+      .IdWidth ( IdMinWidth  ),
+      .Capacity ( MaxTxns     ),
+      .FullBw   ( 1'b1        ),
       .data_t   ( buf_t       )
     ) i_ar_no_atop_id_queue (
       .clk_i,

hw/floo_output_arbiter.sv

@@ -124,9 +124,9 @@ module floo_output_arbiter import floo_pkg::*;
     // Arbitrate between wormhole and reduction arbiter
     // Reductions have higher priority than unicasts (index 0)
     cc_stream_arbiter #(
-      .N_INP  (2),
-      .ARBITER("prio"),
-      .DATA_T (flit_t)
+      .NumInp  (2),
+      .ArbMode (cc_pkg::ARB_PRIO),
+      .data_t  (flit_t)
     ) i_stream_arbiter (
       .clk_i,
       .rst_ni,

hw/floo_reduction_sync.sv

@@ -45,7 +45,7 @@ module floo_reduction_sync import floo_pkg::*;
   end
 
   cc_stream_join_dynamic #(
-    .N_INP ( NumRoutes )
+    .NumInp ( NumRoutes )
   ) i_stream_join_dynamic (
     .inp_valid_i   ( filtered_valid_in      ),
     .inp_ready_o   ( ready_o             ),

hw/floo_reduction_unit.sv

@@ -162,7 +162,7 @@ module floo_reduction_unit
   // - Output 1: Offload unit
   // - Output 2: SelectAW unit
   cc_stream_demux #(
-    .N_OUP ( 2 )
+    .NumOup ( 2 )
   ) i_operands_demux (
     .inp_valid_i   ( operands_valid_out     ),
     .inp_ready_o   ( operands_ready_in      ),
@@ -288,8 +288,8 @@ module floo_reduction_unit
 
   assign result_mux_sel = metadata_flit_out.hdr.collective_op == SeqAW;
   cc_stream_mux #(
-    .DATA_T   ( flit_t ),
-    .N_INP    ( 2 )
+    .data_t   ( flit_t ),
+    .NumInp   ( 2 )
   ) i_result_mux (
     .inp_data_i   ( {aw_out, result_flit_in}        ),
     .inp_valid_i  ( {aw_valid_out, result_valid_in} ),
@@ -311,7 +311,7 @@ module floo_reduction_unit
   );
 
   cc_stream_demux #(
-    .N_OUP ( NumOutputs )
+    .NumOup ( NumOutputs )
   ) i_result_demux (
     .inp_valid_i   ( result_flit_valid_out  ),
     .inp_ready_o   ( result_flit_ready_in   ),

hw/floo_router.sv

@@ -215,7 +215,7 @@ module floo_router
         // onehot decoding of the input direction
         // bypass the reduction if only on  e input member is selected (if none is selected then bypass too [should never occure but to avoid deadlocks])
         cc_popcount #(
-          .INPUT_WIDTH (NumInput)
+          .InputWidth  (NumInput)
         ) i_red_list_counter (
           .data_i       (red_expected_in_route[in][v]),
           .popcount_o   (red_how_many_participants[in][v])
@@ -228,7 +228,7 @@ module floo_router
         assign offload_reduction[in][v] = (~red_single_member[in][v]) &
                             (is_seq_reduction_op(in_routed_data[in][v].hdr.collective_op));
         cc_stream_demux #(
-          .N_OUP              (2)
+          .NumOup             (2)
         ) i_stream_demux (
           .inp_valid_i        (in_valid[in][v]),
           .inp_ready_o        (in_ready[in][v]),