Another round of refactoring

pulp-platform · Sep 8, 2023 · d6733ec · d6733ec
1 parent 9370673
commit d6733ec
Show file tree

Hide file tree

Showing 2 changed files with 216 additions and 216 deletions.
diff --git a/test/tb_floo_dma_chimney.sv b/test/tb_floo_dma_chimney.sv
@@ -11,7 +11,7 @@
 module tb_floo_dma_chimney;
 
   import floo_pkg::*;
-  import floo_axi_flit_pkg::*;
+  import floo_axi_pkg::*;
 
   localparam time CyclTime = 10ns;
   localparam time ApplTime = 0ns;
@@ -26,21 +26,21 @@ module tb_floo_dma_chimney;
   logic clk, rst_n;
 
   axi_in_req_t [NumTargets-1:0] node_man_req;
-  axi_in_resp_t [NumTargets-1:0] node_man_rsp;
+  axi_in_rsp_t [NumTargets-1:0] node_man_rsp;
 
   axi_in_req_t [NumTargets-1:0] node_sub_req;
-  axi_in_resp_t [NumTargets-1:0] node_sub_rsp;
+  axi_in_rsp_t [NumTargets-1:0] node_sub_rsp;
 
   axi_in_req_t [NumTargets-1:0] sub_req_id_mapped;
-  axi_in_resp_t [NumTargets-1:0] sub_rsp_id_mapped;
+  axi_in_rsp_t [NumTargets-1:0] sub_rsp_id_mapped;
 
   for (genvar i = 0; i < NumTargets; i++) begin : gen_axi_assign
     `AXI_ASSIGN_REQ_STRUCT(sub_req_id_mapped[i], node_sub_req[i])
     `AXI_ASSIGN_RESP_STRUCT(sub_rsp_id_mapped[i], node_sub_rsp[i])
   end
 
-  req_flit_t [NumTargets-1:0] chimney_req;
-  rsp_flit_t [NumTargets-1:0] chimney_rsp;
+  floo_req_t [NumTargets-1:0] chimney_req;
+  floo_rsp_t [NumTargets-1:0] chimney_rsp;
 
   logic [NumTargets-1:0] end_of_sim;
 
@@ -71,7 +71,7 @@ module tb_floo_dma_chimney;
     .MemBaseAddr  ( MemBaseAddr     ),
     .MemSize      ( MemSize         ),
     .axi_req_t    ( axi_in_req_t    ),
-    .axi_rsp_t    ( axi_in_resp_t   ),
+    .axi_rsp_t    ( axi_in_rsp_t   ),
     .JobId        ( 0               )
   ) i_floo_dma_test_node_0 (
     .clk_i          ( clk             ),
@@ -90,7 +90,7 @@ module tb_floo_dma_chimney;
     .ar_chan_t  ( axi_in_ar_chan_t ),
     .r_chan_t   ( axi_in_r_chan_t  ),
     .req_t      ( axi_in_req_t     ),
-    .resp_t     ( axi_in_resp_t    )
+    .resp_t     ( axi_in_rsp_t     )
   ) i_axi_channel_compare_0 (
     .clk_i      ( clk                  ),
     .axi_a_req  ( node_man_req[0]      ),
@@ -115,10 +115,10 @@ module tb_floo_dma_chimney;
     .axi_out_rsp_i  ( node_sub_rsp[0]   ),
     .xy_id_i        ( '0                ),
     .id_i           ( '0                ),
-    .req_o          ( chimney_req[0]    ),
-    .rsp_o          ( chimney_rsp[0]    ),
-    .req_i          ( chimney_req[1]    ),
-    .rsp_i          ( chimney_rsp[1]    )
+    .floo_req_o     ( chimney_req[0]    ),
+    .floo_rsp_o     ( chimney_rsp[0]    ),
+    .floo_req_i     ( chimney_req[1]    ),
+    .floo_rsp_i     ( chimney_rsp[1]    )
   );
 
   floo_axi_chimney #(
@@ -137,10 +137,10 @@ module tb_floo_dma_chimney;
     .axi_out_rsp_i  ( node_sub_rsp[1] ),
     .xy_id_i        ( '0              ),
     .id_i           ( '0              ),
-    .req_o          ( chimney_req[1]  ),
-    .rsp_o          ( chimney_rsp[1]  ),
-    .req_i          ( chimney_req[0]  ),
-    .rsp_i          ( chimney_rsp[0]  )
+    .floo_req_o     ( chimney_req[1]  ),
+    .floo_rsp_o     ( chimney_rsp[1]  ),
+    .floo_req_i     ( chimney_req[0]  ),
+    .floo_rsp_i     ( chimney_rsp[0]  )
   );
 
   axi_channel_compare #(
@@ -150,7 +150,7 @@ module tb_floo_dma_chimney;
     .ar_chan_t  ( axi_in_ar_chan_t ),
     .r_chan_t   ( axi_in_r_chan_t  ),
     .req_t      ( axi_in_req_t     ),
-    .resp_t     ( axi_in_resp_t    )
+    .resp_t     ( axi_in_rsp_t    )
   ) i_axi_channel_compare_1 (
     .clk_i(clk),
     .axi_a_req  ( node_man_req[1]      ),
@@ -170,7 +170,7 @@ module tb_floo_dma_chimney;
     .MemBaseAddr  ( MemBaseAddr     ),
     .MemSize      ( MemSize         ),
     .axi_req_t    ( axi_in_req_t    ),
-    .axi_rsp_t    ( axi_in_resp_t   ),
+    .axi_rsp_t    ( axi_in_rsp_t   ),
     .JobId        ( 1               )
   ) i_floo_dma_test_node_1 (
     .clk_i          ( clk             ),
@@ -184,7 +184,7 @@ module tb_floo_dma_chimney;
 
   axi_bw_monitor #(
     .req_t      ( axi_in_req_t  ),
-    .rsp_t      ( axi_in_resp_t ),
+    .rsp_t      ( axi_in_rsp_t ),
     .AxiIdWidth ( AxiInIdWidth  )
   ) i_axi_bw_monitor (
     .clk_i        ( clk             ),