From 3594c08d4b70fa6b97b1d0063abdbd1eaf145974 Mon Sep 17 00:00:00 2001
From: Rose Thompson <ross1728@gmail.com>
Date: Mon, 20 Nov 2023 10:30:35 -0600
Subject: [PATCH] Modified linux imperas tests to 1. enable zicclsm 2. enable
 logging at 7000 ms

---
 config/buildroot/config.vh | 2 +-
 sim/imperas.ic             | 5 +++--
 sim/run-imperas-linux.sh   | 2 +-
 sim/wally-linux-imperas.do | 6 ++++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/config/buildroot/config.vh b/config/buildroot/config.vh
index 0015e2bba..35be93fd6 100644
--- a/config/buildroot/config.vh
+++ b/config/buildroot/config.vh
@@ -45,7 +45,7 @@ localparam SSTC_SUPPORTED = 1;
 localparam ZICBOM_SUPPORTED = 1;
 localparam ZICBOZ_SUPPORTED = 1;
 localparam ZICBOP_SUPPORTED = 1;
-localparam ZICCLSM_SUPPORTED = 0;
+localparam ZICCLSM_SUPPORTED = 1;
 localparam SVPBMT_SUPPORTED = 1;
 localparam SVNAPOT_SUPPORTED = 1;
 localparam SVINVAL_SUPPORTED = 1;
diff --git a/sim/imperas.ic b/sim/imperas.ic
index adb10dcad..d9226c4bb 100644
--- a/sim/imperas.ic
+++ b/sim/imperas.ic
@@ -18,6 +18,8 @@
 # More extensions
 --override cpu/Zcb=T
 
+--override cpu/unaligned=T
+
 # Cache block operations
 --override cpu/Zicbom=T
 --override cpu/Zicbop=T
@@ -40,7 +42,6 @@
 
 --override cpu/reset_address=0x80000000
 
---override cpu/unaligned=F
 --override cpu/ignore_non_leaf_DAU=1
 --override cpu/wfi_is_nop=T
 --override cpu/misa_Extensions_mask=0x0
@@ -88,7 +89,7 @@
 
 # Add Imperas simulator application instruction tracing
 --verbose
---trace --tracechange --traceshowicount --tracemode -tracemem ASX --monitornetschange --traceafter 0
+#--trace --tracechange --traceshowicount --tracemode -tracemem ASX --monitornetschange --traceafter 300000000
 --override cpu/debugflags=6 --override cpu/verbose=1
 --override cpu/show_c_prefix=T
 
diff --git a/sim/run-imperas-linux.sh b/sim/run-imperas-linux.sh
index fd265cb9e..6a49f46e9 100755
--- a/sim/run-imperas-linux.sh
+++ b/sim/run-imperas-linux.sh
@@ -7,4 +7,4 @@ export OTHERFLAGS="+TRACE2LOG_ENABLE=1"
 #export OTHERFLAGS="+TRACE2LOG_ENABLE=1  +TRACE2LOG_AFTER=10500000"
 export OTHERFLAGS=""
 
-vsim -c -do "do wally-linux-imperas.do buildroot buildroot-no-trace $::env(RISCV) 0 0 0"
+vsim -c  -do "do wally-linux-imperas.do buildroot buildroot-no-trace $::env(RISCV) 0 0 0"
diff --git a/sim/wally-linux-imperas.do b/sim/wally-linux-imperas.do
index f173f67c9..196c780be 100644
--- a/sim/wally-linux-imperas.do
+++ b/sim/wally-linux-imperas.do
@@ -40,6 +40,7 @@ if {$2 eq "buildroot" || $2 eq "buildroot-checkpoint"} {
 
     #-- Run the Simulation
     #run -all
+    run 7000 ms
     add log -recursive /*
     do linux-wave.do
     run -all
@@ -87,9 +88,10 @@ if {$2 eq "buildroot" || $2 eq "buildroot-checkpoint"} {
     #run 100 ns
     #force -deposit testbench/dut/core/priv/priv/csr/csri/IE_REGW 16'h2aa
     #force -deposit testbench/dut/uncore/uncore/clint/clint/MTIMECMP 64'h1000
+    run 7000 ms
+    add log -recursive /testbench/dut/*
+    do wave.do
     run 14000 ms
-    #add log -recursive /*
-    #do linux-wave.do
     #run -all
 
     exec ./slack-notifier/slack-notifier.py