test(hbm_model): Remove HBMSize parameter and use only AddrWidth …

…instead Size is anyway not used in the model, it was only used before to derive the `AddrWidth`
pulp-platform · Jan 8, 2024 · dfde1a4 · dfde1a4
1 parent 92dde8d
commit dfde1a4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/hw/tb/tb_floo_dma_mesh.sv b/hw/tb/tb_floo_dma_mesh.sv
@@ -21,8 +21,8 @@ module tb_floo_dma_mesh;
   localparam int unsigned NumMax = (NumX > NumY) ? NumX : NumY;
 
   localparam int unsigned HBMLatency = 100;
-  localparam int unsigned HBMSize = 32'h10000; // 64KB
-  localparam int unsigned MemSize = HBMSize;
+  localparam axi_narrow_in_addr_t HBMSize = 48'h10000; // 64KB
+  localparam axi_narrow_in_addr_t MemSize = HBMSize;
 
   `ASSERT_INIT(NotEnoughXBits, $clog2(NumX + 2) <= $bits(x_bits_t))
   `ASSERT_INIT(NotEnoughYBits, $clog2(NumY + 2) <= $bits(y_bits_t))
@@ -103,7 +103,7 @@ module tb_floo_dma_mesh;
     .TT           ( TestTime                ),
     .Latency      ( HBMLatency              ),
     .NumChannels  ( 1                       ),
-    .MemSize      ( HBMSize                 ),
+    .AddrWidth    ( AxiWideOutAddrWidth     ),
     .DataWidth    ( AxiWideOutDataWidth     ),
     .UserWidth    ( AxiWideOutUserWidth     ),
     .IdWidth      ( AxiWideOutIdWidth       ),
@@ -126,7 +126,7 @@ module tb_floo_dma_mesh;
     .TT           ( TestTime                  ),
     .Latency      ( HBMLatency                ),
     .NumChannels  ( 1                         ),
-    .MemSize      ( HBMSize                   ),
+    .AddrWidth    ( AxiNarrowOutAddrWidth     ),
     .DataWidth    ( AxiNarrowOutDataWidth     ),
     .UserWidth    ( AxiNarrowOutUserWidth     ),
     .IdWidth      ( AxiNarrowOutIdWidth       ),

diff --git a/hw/test/floo_hbm_model.sv b/hw/test/floo_hbm_model.sv
@@ -12,8 +12,7 @@ module floo_hbm_model #(
   parameter time         TT           = 9ns,
   parameter int unsigned Latency      = 100,
   parameter int unsigned NumChannels  = 1,
-  parameter int unsigned MemSize      = 32'h10000,
-  parameter int unsigned AddrWidth    = $clog2(MemSize),
+  parameter int unsigned AddrWidth    = 32,
   parameter int unsigned DataWidth    = 32,
   parameter int unsigned UserWidth    = 1,
   parameter int unsigned IdWidth      = 2,