From 96e77596072b3d661d6510a2c3c912e68a86fea0 Mon Sep 17 00:00:00 2001 From: David Harris Date: Mon, 9 Sep 2024 09:10:49 -0700 Subject: [PATCH 1/2] Removed obsolete script --- bin/radixcopiesmultiregression.sh | 50 ------------------------------- 1 file changed, 50 deletions(-) delete mode 100755 bin/radixcopiesmultiregression.sh diff --git a/bin/radixcopiesmultiregression.sh b/bin/radixcopiesmultiregression.sh deleted file mode 100755 index 5d4f3f653..000000000 --- a/bin/radixcopiesmultiregression.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash -# Alessandro Maiuolo 2022 -# SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1 - -configFile=config/shared/wally-shared.vh - -searchRadix="define RADIX 32'".. -searchCopies="define DIVCOPIES 32'".. - -currRadix="define RADIX 32'h2" -currCopies="define DIVCOPIES 32'h1" -sed -i "s/$searchRadix/$currRadix/" $configFile -sed -i "s/$searchCopies/$currCopies/" $configFile -echo regression on Radix :$currRadix: and Copies :$currCopies: -./sim/regression-wally - -currRadix="define RADIX 32'h2" -currCopies="define DIVCOPIES 32'h2" -sed -i "s/$searchRadix/$currRadix/" $configFile -sed -i "s/$searchCopies/$currCopies/" $configFile -echo regression on Radix :$currRadix: and Copies :$currCopies: -./sim/regression-wally - -currRadix="define RADIX 32'h2" -currCopies="define DIVCOPIES 32'h4" -sed -i "s/$searchRadix/$currRadix/" $configFile -sed -i "s/$searchCopies/$currCopies/" $configFile -echo regression on Radix :$currRadix: and Copies :$currCopies: -./sim/regression-wally - -currRadix="define RADIX 32'h4" -currCopies="define DIVCOPIES 32'h1" -sed -i "s/$searchRadix/$currRadix/" $configFile -sed -i "s/$searchCopies/$currCopies/" $configFile -echo regression on Radix :$currRadix: and Copies :$currCopies: -./sim/regression-wally - -currRadix="define RADIX 32'h4" -currCopies="define DIVCOPIES 32'h2" -sed -i "s/$searchRadix/$currRadix/" $configFile -sed -i "s/$searchCopies/$currCopies/" $configFile -echo regression on Radix :$currRadix: and Copies :$currCopies: -./sim/regression-wally - -currRadix="define RADIX 32'h4" -currCopies="define DIVCOPIES 32'h4" -sed -i "s/$searchRadix/$currRadix/" $configFile -sed -i "s/$searchCopies/$currCopies/" $configFile -echo regression on Radix :$currRadix: and Copies :$currCopies: -./sim/regression-wally \ No newline at end of file From a2a20918351daf236b932182236d912416699b1a Mon Sep 17 00:00:00 2001 From: David Harris Date: Mon, 9 Sep 2024 18:06:08 -0700 Subject: [PATCH 2/2] Associated coverage fixes --- bin/regression-wally | 2 +- examples/link/link.ld | 2 +- sim/questa/wally.do | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/regression-wally b/bin/regression-wally index ccbc249f9..0f8084dd9 100755 --- a/bin/regression-wally +++ b/bin/regression-wally @@ -411,8 +411,8 @@ if (args.ccov): # only run RV64GC tests on Questa in code coverage mode if (args.fp): addTests(tests64gc_fp, coveragesim) elif (args.fcov): # only run RV64GC tests on Questa in lockstep in functional coverage mode -# addLockstepTestsByDir(WALLY+"/tests/functcov/rv64/I", "rv64gc", coveragesim) addLockstepTestsByDir(WALLY+"/addins/cvw-arch-verif/tests/rv32/I", "rv32gc", coveragesim) +# addLockstepTestsByDir(WALLY+"/addins/cvw-arch-verif/tests/rv64/I", "rv64gc", coveragesim) elif (args.fcovrvvi): # only run RV64GC tests on Questa in rvvi coverage mode addTests(tests64gc_nofp, coveragesim) if (args.fp): diff --git a/examples/link/link.ld b/examples/link/link.ld index 174b0e6d8..d5539f7ef 100644 --- a/examples/link/link.ld +++ b/examples/link/link.ld @@ -7,7 +7,7 @@ SECTIONS .text : { *(.text.init) *(.text) } . = ALIGN(0x1000); .tohost : { *(.tohost) } - . = ALIGN(0x1000); + . = ALIGN(0x4000); .data : { *(.data) } .data.string : { *(.data.string)} . = ALIGN(0x1000); diff --git a/sim/questa/wally.do b/sim/questa/wally.do index 6f8c81b1b..1691b2b47 100644 --- a/sim/questa/wally.do +++ b/sim/questa/wally.do @@ -138,6 +138,7 @@ if {[lcheck lst "--fcovimp"]} { # if --fcov found set flag and remove from list if {[lcheck lst "--fcov"]} { set FunctCoverage 1 + # COVER_BASE_RV32I is just needed to keep riscvISACOV happy, but no longer affects tests set FCvlog "+define+INCLUDE_TRACE2COV \ +define+IDV_INCLUDE_TRACE2COV \ +define+COVER_BASE_RV32I \ @@ -192,7 +193,7 @@ if {$DEBUG > 0} { # suppress spurious warnngs about # "Extra checking for conflicts with always_comb done at vopt time" # because vsim will run vopt -set INC_DIRS "+incdir+${CONFIG}/${CFG} +incdir+${CONFIG}/deriv/${CFG} +incdir+${CONFIG}/shared +incdir+${FCRVVI} +incdir+${FCRVVI}/rv32 +incdir+${FCRVVI}/common +incdir+${FCRVVI}" +set INC_DIRS "+incdir+${CONFIG}/${CFG} +incdir+${CONFIG}/deriv/${CFG} +incdir+${CONFIG}/shared +incdir+${FCRVVI} +incdir+${FCRVVI}/rv32 +incdir+${FCRVVI}/rv64 +incdir+${FCRVVI}/common +incdir+${FCRVVI}" set SOURCES "${SRC}/cvw.sv ${TB}/${TESTBENCH}.sv ${TB}/common/*.sv ${SRC}/*/*.sv ${SRC}/*/*/*.sv ${WALLY}/addins/verilog-ethernet/*/*.sv ${WALLY}/addins/verilog-ethernet/*/*/*/*.sv" vlog -lint +nowarnRDGN -work ${WKDIR} {*}${INC_DIRS} {*}${FCvlog} {*}${FCdefineCOVER_EXTS} {*}${lockstepvlog} ${FCdefineRVVI_COVERAGE} {*}${SOURCES} -suppress 2244 -suppress 2282 -suppress 2583 -suppress 7063,2596,13286