Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-11 06:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #734 from ross144/main

Browse Source 
Patches the embench makefile to use wsim rather than wally-batch.do
This commit is contained in:
David Harris 2024-04-16 11:34:14 -06:00 committed by GitHub
commit 84a18515ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmarks/embench/Makefile
View File

@ -44,7 +44,7 @@ sim: modelsim_build_memfile modelsim_run speed
# launches modelsim to simulate tests on wally # launches modelsim to simulate tests on wally
modelsim_run: modelsim_run:
mkdir -p ../../sim/wkdir mkdir -p ../../sim/wkdir
(cd ../../sim/ && vsim -c -do "do wally-batch.do rv32gc embench") (cd ../../sim/ && wsim rv32gc embench)
cd ../../benchmarks/embench/ cd ../../benchmarks/embench/
# builds the objdump based on the compiled c elf files # builds the objdump based on the compiled c elf files

24
fpga/generator/insert_debug_comment.sh
View File

@ -2,9 +2,9 @@
########################################### ###########################################
## insert_debug_comment.sh ## insert_debug_comment.sh
## ##
## Written: Ross Thompson ross1728@gmail.com ## Written: Rose Thompson ross1728@gmail.com
## Created: 20 January 2023 ## Created: 20 January 2023
## Modified: 20 January 2023 ## Modified: 16 April 2024
## ##
## A component of the CORE-V-WALLY configurable RISC-V project. ## A component of the CORE-V-WALLY configurable RISC-V project.
## https://github.com/openhwgroup/cvw ## https://github.com/openhwgroup/cvw
@ -29,11 +29,21 @@
# Then it processes them to add mark_debug on signals needed by the FPGA's ILA. # Then it processes them to add mark_debug on signals needed by the FPGA's ILA.
copiedDir="../src/CopiedFiles_do_not_add_to_repo" copiedDir="../src/CopiedFiles_do_not_add_to_repo"
while read line; do while read line; do
readarray -d ":" -t StrArray <<< "$line" # older versions of bash are incompatible with readarray -d :(
file="${copiedDir}/${StrArray[0]}" #readarray -d ":" -t StrArray <<< "$line"
signal=`echo "${StrArray[1]}" | awk '{$1=$1};1'` #file="${copiedDir}/${StrArray[0]}"
#signal=`echo "${StrArray[1]}" | awk '{$1=$1};1'`
fileName=`echo $line | cut -d ":" -f 1`
file=${copiedDir}/$fileName
signal=`echo $line | cut -d ":" -f 2`
echo $file
echo $signal
readarray -d " " -t SigArray <<< $signal readarray -d " " -t SigArray <<< $signal
sigType=`echo "${SigArray[0]}" | awk '{$1=$1};1'` sigType=`echo $signal | cut -d " " -f 1`
sigName=`echo "${SigArray[1]}" | awk '{$1=$1};1'` sigType=`echo $sigType | awk '{$1=$1};1'`
sigName=`echo $signal | cut -d " " -f 2`
sigName=`echo $sigName | awk '{$1=$1};1'`
#sigType=`echo "${SigArray[0]}" | awk '{$1=$1};1'`
#sigName=`echo "${SigArray[1]}" | awk '{$1=$1};1'`
find $copiedDir -wholename $file | xargs sed -i "s/\(.*${sigType}.*${sigName}\)/(\* mark_debug = \"true\" \*)\1/g" find $copiedDir -wholename $file | xargs sed -i "s/\(.*${sigType}.*${sigName}\)/(\* mark_debug = \"true\" \*)\1/g"
done < ../constraints/marked_debug.txt done < ../constraints/marked_debug.txt