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

Testgen working for Lab 2

Browse Source
This commit is contained in:
David Harris 2022-01-26 18:01:51 +00:00
parent 4d788505f2
commit 21bdce63ff
6 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pipelined/testbench/tests.vh
View File

@ -36,7 +36,7 @@ string tvpaths[] = '{
"../../tests/imperas-riscv-tests/work/" "../../tests/imperas-riscv-tests/work/"
}; };
// *** make sure these are somewhere // *** make sure these are somewhere
string imperas64a[] = '{ string imperas64a[] = '{
`MYIMPERASTEST, `MYIMPERASTEST,
"rv64a/WALLY-AMO", "2110", "rv64a/WALLY-AMO", "2110",
@ -1467,8 +1467,11 @@ string imperas32f[] = '{
string wally64i[] = '{ string wally64i[] = '{
`WALLYTEST, `WALLYTEST,
"rv64i_m/I/add-01", "9010", "rv64i_m/I/WALLY-ADD", "002010",
"rv64i_m/I/PIPELINE", "3010" "rv64i_m/I/WALLY-SLT", "002010",
"rv64i_m/I/WALLY-SLTU", "002010",
"rv64i_m/I/WALLY-SUB", "002010",
"rv64i_m/I/WALLY-XOR", "002010"
}; };
string wally64priv[] = '{ string wally64priv[] = '{
@ -1485,7 +1488,11 @@ string imperas32f[] = '{
string wally32i[] = '{ string wally32i[] = '{
`WALLYTEST, `WALLYTEST,
"rv32i_m/I/PIPELINE", "3010" "rv32i_m/I/WALLY-ADD", "002010",
"rv32i_m/I/WALLY-SLT", "002010",
"rv32i_m/I/WALLY-SLTU", "002010",
"rv32i_m/I/WALLY-SUB", "002010",
"rv32i_m/I/WALLY-XOR", "002010"
}; };
string wally32priv[] = '{ string wally32priv[] = '{

4
tests/testgen/testgen.py
View File

@ -74,7 +74,7 @@ def writeVector(a, b, storecmd, xlen):
lines = lines + "li x" + str(reg2) + ", MASK_XLEN(" + formatstr.format(b) + ")\n" lines = lines + "li x" + str(reg2) + ", MASK_XLEN(" + formatstr.format(b) + ")\n"
lines = lines + test + " x" + str(reg3) + ", x" + str(reg1) + ", x" + str(reg2) + "\n" lines = lines + test + " x" + str(reg3) + ", x" + str(reg1) + ", x" + str(reg2) + "\n"
lines = lines + storecmd + " x" + str(reg3) + ", " + str(wordsize*testnum) + "(x6)\n" lines = lines + storecmd + " x" + str(reg3) + ", " + str(wordsize*testnum) + "(x6)\n"
lines = lines + "RVTEST_IO_ASSERT_GPR_EQ(x7, " + str(reg3) +", "+formatstr.format(expected)+")\n" # lines = lines + "RVTEST_IO_ASSERT_GPR_EQ(x7, " + str(reg3) +", "+formatstr.format(expected)+")\n"
f.write(lines) f.write(lines)
if (xlen == 32): if (xlen == 32):
line = formatrefstr.format(expected)+"\n" line = formatrefstr.format(expected)+"\n"
@ -143,6 +143,8 @@ for xlen in xlens:
# print footer # print footer
line = "\n.EQU NUMTESTS," + str(testnum) + "\n\n"
f.write(line)
h = open("testgen_footer.S", "r") h = open("testgen_footer.S", "r")
for line in h: for line in h:
f.write(line) f.write(line)

22
tests/testgen/testgen_footer.S
View File

@ -4,30 +4,14 @@ RVMODEL_HALT
RVTEST_DATA_BEGIN RVTEST_DATA_BEGIN
.align 4 .align 4
rvtest_data: rvtest_data:
.word 0xbabecafe .word 0x98765432
RVTEST_DATA_END RVTEST_DATA_END
RVMODEL_DATA_BEGIN RVMODEL_DATA_BEGIN
signature_x8_0: wally_signature:
.fill 0*(XLEN/32),4,0xdeadbeef .fill NUMTESTS*(XLEN/32),4,0xdeadbeef
signature_x8_1:
.fill 19*(XLEN/32),4,0xdeadbeef
signature_x1_0:
.fill 256*(XLEN/32),4,0xdeadbeef
signature_x1_1:
.fill 256*(XLEN/32),4,0xdeadbeef
signature_x1_2:
.fill 148*(XLEN/32),4,0xdeadbeef
#ifdef rvtest_mtrap_routine #ifdef rvtest_mtrap_routine

2
tests/testgen/testgen_header.S
View File

@ -23,4 +23,4 @@ rvtest_entry_point:
RVMODEL_BOOT RVMODEL_BOOT
RVTEST_CODE_BEGIN RVTEST_CODE_BEGIN
RVTEST_SIGBASE( x8,signature_x8_1) RVTEST_SIGBASE( x6, wally_signature)

6
tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/Makefrag
View File

@ -28,7 +28,11 @@
# Description: Makefrag for RV32I architectural tests # Description: Makefrag for RV32I architectural tests
rv32i_sc_tests = \ rv32i_sc_tests = \
PIPELINE \ WALLY-ADD \
WALLY-SUB \
WALLY-SLT \
WALLY-SLTU \
WALLY-XOR
rv32i_tests = $(addsuffix .elf, $(rv32i_sc_tests)) rv32i_tests = $(addsuffix .elf, $(rv32i_sc_tests))

5
tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/Makefrag
View File

@ -28,6 +28,11 @@
# Description: Makefrag for RV64I architectural tests # Description: Makefrag for RV64I architectural tests
rv64i_sc_tests = \ rv64i_sc_tests = \
WALLY-ADD \
WALLY-SUB \
WALLY-SLT \
WALLY-SLTU \
WALLY-XOR
rv64i_tests = $(addsuffix .elf, $(rv64i_sc_tests)) rv64i_tests = $(addsuffix .elf, $(rv64i_sc_tests))