fix merge error once again

2024-05-08 11:31:43 -07:00
parent 16dfae7d3f
commit 0dd5335851
2 changed files with 1 additions and 2 deletions
--- a/hw/rtl/VX_config.vh
+++ b/hw/rtl/VX_config.vh
@@ -278,7 +278,7 @@

 // Size of LSU Request Queue
 `ifndef LSUQ_SIZE
-`define LSUQ_SIZE   (8 * (`NUM_THREADS / `NUM_LSU_LANES))
+`define LSUQ_SIZE   (4 * `NUM_WARPS * (`NUM_THREADS / `NUM_LSU_LANES))
 `endif

 // LSU Duplicate Address Check
--- a/hw/rtl/VX_platform.vh
+++ b/hw/rtl/VX_platform.vh
@@ -35,7 +35,6 @@
 `define NUM_CORES 2
 `define NUM_THREADS 8
 `define NUM_WARPS 8
-`endif

 `define FIRESIM
 `endif // SYNTHESIS