Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-03 10:15:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #330 from openhwgroup/revert-328-main

Browse Source 
Revert "Update for new layout of ImperasDV files"
This commit is contained in:
David Harris 2023-06-13 04:18:57 -07:00 committed by GitHub
commit 90bc0bc6d8
7 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sim/imperas.ic
View File

@ -1,8 +1,7 @@
#--mpdconsole #--mpdconsole
#--gdbconsole #--gdbconsole
#--showoverrides --showoverrides
#--showcommands --showcommands
#--showcommands
# Core settings # Core settings
--override cpu/priv_version=1.12 --override cpu/priv_version=1.12

4
sim/run-imperas-linux.sh
View File

@ -3,8 +3,8 @@
#export RISCV=/scratch/moore/RISCV #export RISCV=/scratch/moore/RISCV
export IMPERAS_TOOLS=$(pwd)/imperas.ic export IMPERAS_TOOLS=$(pwd)/imperas.ic
#export OTHERFLAGS="+IDV_TRACE2LOG=1" export OTHERFLAGS="+TRACE2LOG_ENABLE=1"
#export OTHERFLAGS="+IDV_TRACE2LOG=1 +IDV_TRACE2LOG_AFTER=10500000" #export OTHERFLAGS="+TRACE2LOG_ENABLE=1 +TRACE2LOG_AFTER=10500000"
export OTHERFLAGS="" 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"

2
sim/run-imperasdv-tests.bash
View File

@ -8,7 +8,7 @@ mkdir -p results
ALL=$(find ${WALLY}/external/ImperasDV-HMC/tests/riscof/work/riscv-arch-test/rv64i_m -name "ref" -type d) ALL=$(find ${WALLY}/external/ImperasDV-HMC/tests/riscof/work/riscv-arch-test/rv64i_m -name "ref" -type d)
export IMPERAS_TOOLS=$(pwd)/imperas.ic export IMPERAS_TOOLS=$(pwd)/imperas.ic
export OTHERFLAGS="+IDV_TRACE2LOG=1 VERBOSE=1" export OTHERFLAGS="+TRACE2LOG_ENABLE=1 VERBOSE=1"
for t in $ALL; do for t in $ALL; do
export TESTDIR=$(dirname ${t}) export TESTDIR=$(dirname ${t})

2
sim/sim-imperas
View File

@ -27,6 +27,6 @@
## and limitations under the License. ## and limitations under the License.
################################################################################################ ################################################################################################
IMPERAS_TOOLS=$(pwd)/imperas.ic \ IMPERAS_TOOLS=$(pwd)/imperas.ic \
OTHERFLAGS="+IDV_TRACE2LOG=1 VERBOSE=1" \ OTHERFLAGS="+TRACE2LOG_ENABLE=1 VERBOSE=1" \
TESTDIR=${WALLY}/tests/riscof/work/wally-riscv-arch-test/rv64i_m/privilege/src/Lee.S/ \ TESTDIR=${WALLY}/tests/riscof/work/wally-riscv-arch-test/rv64i_m/privilege/src/Lee.S/ \
vsim -do "do wally-imperas.do rv64gc" vsim -do "do wally-imperas.do rv64gc"

14
sim/wally-imperas.do
View File

@ -30,13 +30,13 @@ vlog +incdir+../config/$1 \
+define+USE_IMPERAS_DV \ +define+USE_IMPERAS_DV \
+incdir+$env(IMPERAS_HOME)/ImpPublic/include/host \ +incdir+$env(IMPERAS_HOME)/ImpPublic/include/host \
+incdir+$env(IMPERAS_HOME)/ImpProprietary/include/host \ +incdir+$env(IMPERAS_HOME)/ImpProprietary/include/host \
$env(IMPERAS_HOME)/ImpPublic/source/host/rvvi/rvviApiPkg.sv \ $env(IMPERAS_HOME)/ImpPublic/source/host/rvvi/rvvi-api-pkg.sv \
$env(IMPERAS_HOME)/ImpPublic/source/host/rvvi/rvviTrace.sv \ $env(IMPERAS_HOME)/ImpPublic/source/host/rvvi/rvvi-trace.sv \
$env(IMPERAS_HOME)/ImpProprietary/source/host/idv/idvPkg.sv \ $env(IMPERAS_HOME)/ImpProprietary/source/host/rvvi/rvvi-pkg.sv \
$env(IMPERAS_HOME)/ImpProprietary/source/host/idv/idvApiPkg.sv \ $env(IMPERAS_HOME)/ImpProprietary/source/host/rvvi/imperasDV-api-pkg.sv \
$env(IMPERAS_HOME)/ImpProprietary/source/host/idv/trace2api.sv \ $env(IMPERAS_HOME)/ImpProprietary/source/host/rvvi/trace2api.sv \
$env(IMPERAS_HOME)/ImpProprietary/source/host/idv/trace2log.sv \ $env(IMPERAS_HOME)/ImpProprietary/source/host/rvvi/trace2log.sv \
$env(IMPERAS_HOME)/ImpProprietary/source/host/idv/trace2cov.sv \ $env(IMPERAS_HOME)/ImpProprietary/source/host/rvvi/trace2cov.sv \
../src/wally/cvw.sv \ ../src/wally/cvw.sv \
../testbench/testbench_imperas.sv \ ../testbench/testbench_imperas.sv \
../testbench/common/*.sv \ ../testbench/common/*.sv \

4
testbench/testbench-linux-imperas.sv
View File

@ -30,7 +30,7 @@
// `define USE_IMPERAS_DV // `define USE_IMPERAS_DV
`ifdef USE_IMPERAS_DV `ifdef USE_IMPERAS_DV
`include "idv/idv.svh" `include "rvvi/imperasDV.svh"
`endif `endif
`define DEBUG_TRACE 0 `define DEBUG_TRACE 0
@ -302,7 +302,7 @@ module testbench;
initial begin initial begin
int iter; int iter;
#1; #1;
IDV_MAX_ERRS = 3; MAX_ERRS = 3;
// Initialize REF (do this before initializing the DUT) // Initialize REF (do this before initializing the DUT)
if (!rvviVersionCheck(RVVI_API_VERSION)) begin if (!rvviVersionCheck(RVVI_API_VERSION)) begin

6
testbench/testbench_imperas.sv
View File

@ -31,16 +31,16 @@
// `define USE_IMPERAS_DV // `define USE_IMPERAS_DV
`ifdef USE_IMPERAS_DV `ifdef USE_IMPERAS_DV
`include "idv/idv.svh" `include "rvvi/imperasDV.svh"
`endif `endif
module testbench; module testbench;
parameter DEBUG=0; parameter DEBUG=0;
`ifdef USE_IMPERAS_DV `ifdef USE_IMPERAS_DV
import rvviPkg::*;
import rvviApiPkg::*; import rvviApiPkg::*;
import idvApiPkg::*; import idvApiPkg::*;
import idvPkg::*;
`endif `endif
logic clk; logic clk;
@ -140,7 +140,7 @@ module testbench;
initial begin initial begin
IDV_MAX_ERRS = 3; MAX_ERRS = 3;
// Initialize REF (do this before initializing the DUT) // Initialize REF (do this before initializing the DUT)
if (!rvviVersionCheck(RVVI_API_VERSION)) begin if (!rvviVersionCheck(RVVI_API_VERSION)) begin