Xavi/cvw
1
0
Fork 0
forked from Github_Repos/cvw
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More merge conflicts yay

Browse Source
This commit is contained in:
ethan-falicov 2021-02-10 09:54:30 -05:00
parent f778f464b7
commit 7e8a58de1a
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wally-pipelined/testbench/testbench-imperas.sv
View File

@ -233,7 +233,6 @@ string tests32i[] = {
"rv32i/I-XOR-01","2000", "rv32i/I-XOR-01","2000",
"rv32i/I-XORI-01","2000", "rv32i/I-XORI-01","2000",
"rv32i/WALLY-ADD", "3000", "rv32i/WALLY-ADD", "3000",
<<<<<<< HEAD
"rv32i/WALLY-SUB", "3000", "rv32i/WALLY-SUB", "3000",
"rv32i/WALLY-ADDI", "2000", "rv32i/WALLY-ADDI", "2000",
"rv32i/WALLY-ANDI", "2000", "rv32i/WALLY-ANDI", "2000",
@ -244,12 +243,10 @@ string tests32i[] = {
"rv32i/WALLY-SLLI", "2000", "rv32i/WALLY-SLLI", "2000",
"rv32i/WALLY-SRLI", "2000", "rv32i/WALLY-SRLI", "2000",
"rv32i/WALLY-SRAI", "2000" "rv32i/WALLY-SRAI", "2000"
=======
"rv32i/WALLY-LOAD", "11c00", "rv32i/WALLY-LOAD", "11c00",
"rv32i/WALLY-SUB", "3000", "rv32i/WALLY-SUB", "3000",
"rv32i/WALLY-STORE", "2000", "rv32i/WALLY-STORE", "2000",
"rv32i/WALLY-JAL", "3000" "rv32i/WALLY-JAL", "3000"
>>>>>>> 88ccaff534d6bc14ccf767006b2d25505d0ce674
}; };
string tests[]; string tests[];