🔥 hot-fix: Bump old axi to fix CI. Mcast driver issue when no voptargs

Author: Lore0599

Bender.lock

@@ -7,8 +7,8 @@ packages:
     dependencies:
     - common_cells
   axi:
-    revision: fed6a2f3a92ad7d7b7ef42840901eb218a3c5532
-    version: null
+    revision: 39f5f2d51c5e524f6fc5cf8b6e901f7dcc5622d7
+    version: 0.39.6
     source:
       Git: https://github.com/pulp-platform/axi.git
     dependencies:

Bender.yml

@@ -13,7 +13,7 @@ dependencies:
   idma: { git: "https://github.com/pulp-platform/iDMA.git", version: 0.6.2 }
   common_cells: { git: "https://github.com/pulp-platform/common_cells.git", version: 1.35.0 }
   common_verification: { git: "https://github.com/pulp-platform/common_verification.git", version: 0.2.3 }
-  axi: { git: "https://github.com/pulp-platform/axi.git", rev: "feature/multicast-xbar" } # TODO: Use release once merged
+  axi: { git: "https://github.com/pulp-platform/axi.git", version: 0.39.3 } # TODO: Use release once merged
   axi_riscv_atomics: { git: "https://github.com/pulp-platform/axi_riscv_atomics.git", version: 0.8.2 }
 
 export_include_dirs:

hw/floo_router.sv

@@ -164,7 +164,8 @@ module floo_router
         assign acc_masked_ready_d[in][v] = (in_ready[in][v]) ? '0 :
                                             (acc_masked_ready_q[in][v] | masked_all_ready[in][v]);
         assign current_accumulated[in][v] = acc_masked_ready_q[in][v] | masked_all_ready[in][v];
-        assign in_ready[in][v] = &(current_accumulated[in][v] | ~(NoLoopback? (route_mask[in][v] & ~(1 << in)) : route_mask[in][v]));
+        assign in_ready[in][v] = &(current_accumulated[in][v] |
+                               ~(NoLoopback? (route_mask[in][v] & ~(1 << in)) : route_mask[in][v]));
       end
     end
   end

hw/tb/wave/tb_floo_nw_chimney.wave.tcl

@@ -8,7 +8,7 @@ floo_wave_init
 
 for {set i 0} {$i < 2} {incr i} {
     set name [list "Chimney $i"]
-    floo_nw_chimney_wave tb_floo_narrow_wide_chimney/i_floo_narrow_wide_chimney_${i} $name
+    floo_nw_chimney_wave tb_floo_nw_chimney/i_floo_nw_chimney_${i} $name
 }
 
 floo_wave_style

hw/test/floo_axi_rand_slave.sv

@@ -74,9 +74,9 @@ module floo_axi_rand_slave #(
     UniqueIds:          0,
     AxiAddrWidth:       AxiCfg.AddrWidth,
     AxiDataWidth:       AxiCfg.DataWidth,
-    NoAddrRules:        NumSlaves,
-    NoMulticastPorts:   0,
-    NoMulticastRules:   0
+    NoAddrRules:        NumSlaves
+    // NoMulticastPorts:   0,
+    // NoMulticastRules:   0
   };
 
   axi_xbar_req_t xbar_in_req;

hw/test/floo_axi_test_node.sv

@@ -69,8 +69,8 @@ module floo_axi_test_node #(
     .W_MIN_WAIT_CYCLES    ( 0              ),
     .W_MAX_WAIT_CYCLES    ( 0              ),
     .RESP_MIN_WAIT_CYCLES ( 0              ),
-    .RESP_MAX_WAIT_CYCLES ( 0              ),
-    .ENABLE_MULTICAST     ( EnMultiCast    )
+    .RESP_MAX_WAIT_CYCLES ( 0              )
+    // .ENABLE_MULTICAST     ( EnMultiCast    )
   ) axi_rand_master_t;
 
   AXI_BUS_DV #(
@@ -105,9 +105,9 @@ module floo_axi_test_node #(
                                         AddrRegions[i].end_addr,
                                         axi_pkg::DEVICE_NONBUFFERABLE);
     end
-    if(EnMultiCast) begin
-      axi_rand_master.set_multicast_probability(50);
-    end
+    // if(EnMultiCast) begin
+    //   axi_rand_master.set_multicast_probability(50);
+    // end
     axi_rand_master.reset();
     @(posedge rst_ni)
     axi_rand_master.run(NumReads, NumWrites);

hw/test/floo_dma_test_node.sv

@@ -152,9 +152,9 @@ module floo_dma_test_node  #(
     AxiAddrWidth:       AxiCfg.AddrWidth,
     AxiDataWidth:       AxiCfg.DataWidth,
     NoAddrRules:        1,
-    PipelineStages:     0,
-    NoMulticastPorts:   0,
-    NoMulticastRules:   0
+    PipelineStages:     0
+    // NoMulticastPorts:   0,
+    // NoMulticastRules:   0
   };
 
   //--------------------------------------