Added helpful signals to wavefile.

Makefile for tests now creates the function address to name mapping files.
The function name and test name are included in the wave file.
This commit is contained in:
Ross Thompson 2022-02-02 10:02:56 -06:00
parent 4b4cee3ddd
commit 2d827bf8c0
2 changed files with 10 additions and 11 deletions

View File

@ -14,29 +14,30 @@ make all:
make -C ../../tests/imperas-riscv-tests make -C ../../tests/imperas-riscv-tests
make -C ../../tests/imperas-riscv-tests XLEN=64 make -C ../../tests/imperas-riscv-tests XLEN=64
cd ../../tests/imperas-riscv-tests; exe2memfile.pl work/*/*.elf cd ../../tests/imperas-riscv-tests; exe2memfile.pl work/*/*.elf
cd ../../tests/imperas-riscv-tests; extractFunctionRadix.sh work/*/*.elf cd ../../tests/imperas-riscv-tests; extractFunctionRadix.sh work/*/*.elf.objdump
# Build riscv-arch-test 64 and 32-bit versions # Build riscv-arch-test 64 and 32-bit versions
make -C ../../addins/riscv-arch-test make -C ../../addins/riscv-arch-test
make -C ../../addins/riscv-arch-test XLEN=32 make -C ../../addins/riscv-arch-test XLEN=32
cd ../../addins/riscv-arch-test; elf2hex.sh cd ../../addins/riscv-arch-test; elf2hex.sh
cd ../../addins/riscv-arch-test; extractFunctionRadix.sh work/*/*/*.elf cd ../../addins/riscv-arch-test; extractFunctionRadix.sh work/*/*/*.elf.objdump
# extractFunctionRadix. *** # extractFunctionRadix. ***
# Build wally-riscv-arch-test # Build wally-riscv-arch-test
make -C ../../tests/wally-riscv-arch-test/ make -C ../../tests/wally-riscv-arch-test/
make -C ../../tests/wally-riscv-arch-test/ XLEN=32 make -C ../../tests/wally-riscv-arch-test/ XLEN=32
cd ../../tests/wally-riscv-arch-test; elf2hex.sh cd ../../tests/wally-riscv-arch-test; elf2hex.sh
cd ../../tests/wally-riscv-arch-test; extractFunctionRadix.sh work/*/*/*.elf cd ../../tests/wally-riscv-arch-test; extractFunctionRadix.sh work/*/*/*.elf.objdump
# ***extractFunctionRadix # ***extractFunctionRadix
# Only compile Imperas tests if they are installed locally. # Only compile Imperas tests if they are installed locally.
# They are usually a symlink to $RISCV/imperas-riscv-tests and only # They are usually a symlink to $RISCV/imperas-riscv-tests and only
# get compiled there manually during installation # get compiled there manually during installation
# make -C ../../addins/imperas-riscv-tests #make -C ../../addins/imperas-riscv-tests
# make -C ../../addins/imperas-riscv-tests XLEN=64 #make -C ../../addins/imperas-riscv-tests XLEN=64
# cd ../../addins/imperas-riscv-tests; elf2hex.sh #cd ../../addins/imperas-riscv-tests; elf2hex.sh
#cd ../../addins/imperas-riscv-tests; extractFunctionRadix.sh work/*/*/*.elf.objdump
# Link Linux test vectors (fix this later***) # Link Linux test vectors (fix this later***)
#cd ../../tests/linux-testgen/linux-testvectors/;./tvLinker.sh #cd ../../tests/linux-testgen/linux-testvectors/;./tvLinker.sh

View File

@ -3,6 +3,7 @@ quietly WaveActivateNextPane {} 0
add wave -noupdate /testbench/clk add wave -noupdate /testbench/clk
add wave -noupdate /testbench/reset add wave -noupdate /testbench/reset
add wave -noupdate /testbench/reset_ext add wave -noupdate /testbench/reset_ext
add wave -noupdate /testbench/memfilename
add wave -noupdate /testbench/dut/core/SATP_REGW add wave -noupdate /testbench/dut/core/SATP_REGW
add wave -noupdate -group HDU -expand -group hazards /testbench/dut/core/hzu/BPPredWrongE add wave -noupdate -group HDU -expand -group hazards /testbench/dut/core/hzu/BPPredWrongE
add wave -noupdate -group HDU -expand -group hazards /testbench/dut/core/hzu/CSRWritePendingDEM add wave -noupdate -group HDU -expand -group hazards /testbench/dut/core/hzu/CSRWritePendingDEM
@ -474,11 +475,8 @@ add wave -noupdate -expand -group {Performance Counters} -expand -group ICACHE -
add wave -noupdate -expand -group {Performance Counters} -expand -group ICACHE -label {ICACHE MISS} -radix unsigned {/testbench/dut/core/priv/priv/csr/counters/counters/HPMCOUNTER_REGW[14]} add wave -noupdate -expand -group {Performance Counters} -expand -group ICACHE -label {ICACHE MISS} -radix unsigned {/testbench/dut/core/priv/priv/csr/counters/counters/HPMCOUNTER_REGW[14]}
add wave -noupdate -expand -group {Performance Counters} -expand -group DCACHE -label {DCACHE ACCESS} -radix unsigned {/testbench/dut/core/priv/priv/csr/counters/counters/HPMCOUNTER_REGW[11]} add wave -noupdate -expand -group {Performance Counters} -expand -group DCACHE -label {DCACHE ACCESS} -radix unsigned {/testbench/dut/core/priv/priv/csr/counters/counters/HPMCOUNTER_REGW[11]}
add wave -noupdate -expand -group {Performance Counters} -expand -group DCACHE -label {DCACHE MISS} -radix unsigned {/testbench/dut/core/priv/priv/csr/counters/counters/HPMCOUNTER_REGW[12]} add wave -noupdate -expand -group {Performance Counters} -expand -group DCACHE -label {DCACHE MISS} -radix unsigned {/testbench/dut/core/priv/priv/csr/counters/counters/HPMCOUNTER_REGW[12]}
add wave -noupdate /testbench/FunctionName/FunctionName/AnyUnknown
add wave -noupdate /testbench/FunctionName/FunctionName/OrReducedAdr
add wave -noupdate /testbench/FunctionName/FunctionName/ProgramAddrIndex
TreeUpdate [SetDefaultTree] TreeUpdate [SetDefaultTree]
WaveRestoreCursors {{Cursor 7} {3051 ns} 0} {{Cursor 5} {49445 ns} 1} {{Cursor 3} {235459 ns} 1} {{Cursor 4} {217231 ns} 1} WaveRestoreCursors {{Cursor 7} {6451242 ns} 0} {{Cursor 5} {49445 ns} 1} {{Cursor 3} {235459 ns} 1} {{Cursor 4} {217231 ns} 1}
quietly wave cursor active 1 quietly wave cursor active 1
configure wave -namecolwidth 250 configure wave -namecolwidth 250
configure wave -valuecolwidth 314 configure wave -valuecolwidth 314
@ -494,4 +492,4 @@ configure wave -griddelta 40
configure wave -timeline 0 configure wave -timeline 0
configure wave -timelineunits ns configure wave -timelineunits ns
update update
WaveRestoreZoom {0 ns} {111637 ns} WaveRestoreZoom {593782 ns} {7438712 ns}