From f9b14ccdc5932c8fcfb54dc418e56b96ae53d5b2 Mon Sep 17 00:00:00 2001 From: eroom1966 Date: Thu, 19 Jan 2023 10:20:55 +0000 Subject: [PATCH 1/3] customer commands --- setup.imperas.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/setup.imperas.sh b/setup.imperas.sh index ac7740796..7ec1afd99 100644 --- a/setup.imperas.sh +++ b/setup.imperas.sh @@ -1,11 +1,12 @@ #!/bin/bash -echo "Imperas Environment to setup Wally" +REPO=davidharrishmc +REPO=eroom1966 +git clone https://github.com/${REPO}/riscv-wally -b imperas -# Path to Wally repository +cd riscv-wally WALLY=$(dirname ${BASH_SOURCE[0]:-$0}) export WALLY=$(cd "$WALLY" && pwd) -echo \$WALLY set to ${WALLY} # clone the Imperas repo if [ ! -d external ]; then @@ -16,24 +17,23 @@ pushd external git clone https://github.com/Imperas/ImperasDV-HMC fi pushd ImperasDV-HMC - git checkout 0c2f365 + git checkout fac563d popd popd -isetup -dv ${WALLY}/external/ImperasDV-HMC/Imperas +# Setup Imperas +source ${WALLY}/external/ImperasDV-HMC/Imperas/bin/setup.sh +setupImperas ${WALLY}/external/ImperasDV-HMC/Imperas +export IMPERAS_PERSONALITY=CPUMAN_DV_ASYNC + +# setup QUESTA (Imperas only command, YMMV) svsetup -questa pushd pipelined/regression # With IDV IMPERAS_TOOLS=$(pwd)/imperas.ic \ OTHERFLAGS="+TRACE2LOG_ENABLE=1 VERBOSE=1" \ - TESTDIR=../../tests/riscof_lee/work/riscv-arch-test/rv64i_m/F/src/fadd_b1-01.S \ + TESTDIR=${WALLY}/external/ImperasDV-HMC/tests/riscof/work/riscv-arch-test/rv64i_m/F/src/fadd_b1-01.S \ vsim -c -do "do wally-pipelined-imperas.do rv64gc" - - # Without IDV - IMPERAS_TOOLS=$(pwd)/imperas.ic \ - OTHERFLAGS="+TRACE2LOG_ENABLE=1 VERBOSE=1" \ - TESTDIR=../../tests/riscof_lee/work/riscv-arch-test/rv64i_m/F/src/fadd_b1-01.S \ - vsim -c -do "do wally-pipelined-imperas-no-idv.do rv64gc" popd From 52124995132cd64acf419d7992e71a9463e23638 Mon Sep 17 00:00:00 2001 From: eroom1966 Date: Thu, 19 Jan 2023 10:41:11 +0000 Subject: [PATCH 2/3] correct the HASH --- setup.imperas.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/setup.imperas.sh b/setup.imperas.sh index 7ec1afd99..d1de23ab4 100644 --- a/setup.imperas.sh +++ b/setup.imperas.sh @@ -1,5 +1,7 @@ #!/bin/bash +IMP_HASH=56b1479 + REPO=davidharrishmc REPO=eroom1966 git clone https://github.com/${REPO}/riscv-wally -b imperas @@ -17,7 +19,7 @@ pushd external git clone https://github.com/Imperas/ImperasDV-HMC fi pushd ImperasDV-HMC - git checkout fac563d + git checkout $IMP_HASH popd popd From 43d5769bd9523f6d11b3e200023261c3aeed7dc4 Mon Sep 17 00:00:00 2001 From: eroom1966 Date: Thu, 19 Jan 2023 13:29:46 +0000 Subject: [PATCH 3/3] update --- .gitignore | 1 + pipelined/regression/run-imperasdv-tests.bash | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100755 pipelined/regression/run-imperasdv-tests.bash diff --git a/.gitignore b/.gitignore index a7f1d43be..c9935826d 100644 --- a/.gitignore +++ b/.gitignore @@ -127,3 +127,4 @@ tests/custom/*/*/*.memfile tests/custom/crt0/*.a /pipelined/regression/sd_model.log external +pipelined/regression/results diff --git a/pipelined/regression/run-imperasdv-tests.bash b/pipelined/regression/run-imperasdv-tests.bash new file mode 100755 index 000000000..c037c369d --- /dev/null +++ b/pipelined/regression/run-imperasdv-tests.bash @@ -0,0 +1,22 @@ +#!/bin/bash + +if [ -d results ]; then + rm -rf results +fi +mkdir -p results + +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 OTHERFLAGS="+TRACE2LOG_ENABLE=1 VERBOSE=1" + +for t in $ALL; do + export TESTDIR=$(dirname ${t}) + OUTLOG=$(echo ${TESTDIR} | sed "s|${WALLY}/external/ImperasDV-HMC/tests/riscof/work|results|").log + OUTDIR=$(dirname ${OUTLOG}) + echo "Running test ${TESTDIR} -> ${OUTDIR} :: ${OUTLOG}" + + mkdir -p ${OUTDIR} + vsim -c -do "do wally-pipelined-imperas.do rv64gc" + mv transcript ${OUTLOG} +done