From cfaeeae25a44dfd2c95f4fbdb0b06abb1622c5ba Mon Sep 17 00:00:00 2001
From: David Harris <David_Harris@hmc.edu>
Date: Wed, 15 Nov 2023 08:15:01 -0800
Subject: [PATCH] Added cmoz support to imperas.ic and adjusted imperas
 testbench to no longer need FPGA parameter

---
 sim/imperas.ic                 | 5 ++++-
 testbench/testbench-imperas.sv | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sim/imperas.ic b/sim/imperas.ic
index adb10dcad..8d20cdd8f 100644
--- a/sim/imperas.ic
+++ b/sim/imperas.ic
@@ -22,6 +22,9 @@
 --override cpu/Zicbom=T
 --override cpu/Zicbop=T
 --override cpu/Zicboz=T
+--override cmomp_bytes=64  # Zic64b
+--override cmoz_bytes=64   # Zic64b
+--override lr_sc_grain=64  # Za64rs
 
 # 64 KiB continuous huge pages supported
 --override cpu/Svpbmt=T
@@ -40,7 +43,7 @@
 
 --override cpu/reset_address=0x80000000
 
---override cpu/unaligned=F
+--override cpu/unaligned=T  # Zicclsm (should be true)
 --override cpu/ignore_non_leaf_DAU=1
 --override cpu/wfi_is_nop=T
 --override cpu/misa_Extensions_mask=0x0
diff --git a/testbench/testbench-imperas.sv b/testbench/testbench-imperas.sv
index b503372d4..c27722f9f 100644
--- a/testbench/testbench-imperas.sv
+++ b/testbench/testbench-imperas.sv
@@ -237,7 +237,7 @@ module testbench;
     assign HRDATAEXT = 0;
   end
 
-  if(P.FPGA) begin : sdcard
+  if(P.SDC_SUPPORTED) begin : sdcard
     // *** fix later
 /* -----\/----- EXCLUDED -----\/-----
     sdModel sdcard