From f71e705d53ccc63f0fe639ea7c66c5fbc4a64b2b Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Tue, 7 May 2024 16:23:32 -0700
Subject: [PATCH 1/2] Revert to old LSUQ_SIZE

---
 hw/rtl/VX_config.vh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/rtl/VX_config.vh b/hw/rtl/VX_config.vh
index f0910b2b..a5f61679 100644
--- 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   (4 * `NUM_WARPS * (`NUM_THREADS / `NUM_LSU_LANES))
+`define LSUQ_SIZE   (8 * (`NUM_THREADS / `NUM_LSU_LANES))
 `endif
 
 // LSU Duplicate Address Check

From be748b109a6b468a1d59c39f0008d08a3e4076b4 Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Tue, 7 May 2024 18:37:25 -0700
Subject: [PATCH 2/2] Fix faulty merge on syn-only flags

---
 hw/rtl/VX_platform.vh | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/hw/rtl/VX_platform.vh b/hw/rtl/VX_platform.vh
index 9def99b6..091e5d14 100644
--- a/hw/rtl/VX_platform.vh
+++ b/hw/rtl/VX_platform.vh
@@ -21,7 +21,7 @@
 `define DPI_DISABLE
 `else
 `define SV_DPI
-`endif
+`endif // SIMULATION
 
 `ifdef SYNTHESIS
 `define GPR_RESET
@@ -37,15 +37,7 @@
 `define NUM_WARPS 8
 
 `define FIRESIM
-
-// synthesis only
-`ifndef SIMULATION
-`define SYNTHESIS
-`define NDEBUG
-`define DPI_DISABLE
-`else
-`define SV_DPI
-`endif
+`endif // SYNTHESIS
 
 `ifdef SV_DPI
 `include "util_dpi.vh"