From 83dc9cd926e21a7e908875f5b5babeb400be2767 Mon Sep 17 00:00:00 2001 From: Rose Thompson Date: Wed, 7 Feb 2024 15:53:40 -0600 Subject: [PATCH] More cleanup. --- sim/wally-linux-imperas.do | 6 +++--- testbench/testbench.sv | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sim/wally-linux-imperas.do b/sim/wally-linux-imperas.do index bdaaacfdc..1165676a0 100644 --- a/sim/wally-linux-imperas.do +++ b/sim/wally-linux-imperas.do @@ -60,8 +60,8 @@ if {$2 eq "buildroot"} { # vsim -fprofile+perf # visualizer -fprofile+perf+dir=fprofile # - eval vopt work_${1}_${2}.testbench -work work_${1}_${2} -G RISCV_DIR=$3 \ - -G INSTR_LIMIT=1000000 -G TEST=$2 -G INSTR_WAVEON=0 -G CHECKPOINT=0 -G NO_SPOOFING=1 -o testbenchopt + eval vopt +acc work_${1}_${2}.testbench -work work_${1}_${2} -G RISCV_DIR=$3 \ + -G TEST=$2 -o testbenchopt eval vsim -lib work_${1}_${2} testbenchopt -suppress 8852,12070,3084,3829,13286 -fatal 7 \ -sv_lib $env(IMPERAS_HOME)/lib/Linux64/ImperasLib/imperas.com/verification/riscv/1.0/model \ $env(OTHERFLAGS) @@ -73,9 +73,9 @@ if {$2 eq "buildroot"} { #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 9800 ms add log -recursive /testbench/dut/* do wave.do - run 9800 ms run 200 ms #run -all diff --git a/testbench/testbench.sv b/testbench/testbench.sv index d22820047..0f8194e62 100644 --- a/testbench/testbench.sv +++ b/testbench/testbench.sv @@ -655,6 +655,9 @@ end void'(rvviRefCsrSetVolatile(0, 32'h104)); // SIE - Temporary!!!! // Load memory + // *** RT: This section can probably be moved into the same chunk of code which + // loads the memories. However I'm not sure that ImperasDV supports reloading + // the memories without relaunching the simulator. begin longint x64; int x32[2]; @@ -696,7 +699,7 @@ end $display("RVVI Loading Complete"); - void'(rvviRefPcSet(0, 'h1000)); // set BOOTROM address + void'(rvviRefPcSet(0, P.RESET_VECTOR)); // set BOOTROM address end end