github-mirrors/cvw
1
0
Fork 0
mirror of https://github.com/openhwgroup/cvw.git synced 2025-04-23 13:27:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

More merge conflicts yay

Browse source
This commit is contained in:
ethan-falicov 2021-02-10 09:54:30 -05:00
parent 863796b3c1
commit 06517631cc
1 changed files with 0 additions and 3 deletions
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-XORI-01","2000",
"rv32i/WALLY-ADD", "3000",
<<<<<<< HEAD
"rv32i/WALLY-SUB", "3000",
"rv32i/WALLY-ADDI", "2000",
"rv32i/WALLY-ANDI", "2000",
@ -244,12 +243,10 @@ string tests32i[] = {
"rv32i/WALLY-SLLI", "2000",
"rv32i/WALLY-SRLI", "2000",
"rv32i/WALLY-SRAI", "2000"
=======
"rv32i/WALLY-LOAD", "11c00",
"rv32i/WALLY-SUB", "3000",
"rv32i/WALLY-STORE", "2000",
"rv32i/WALLY-JAL", "3000"
>>>>>>> 88ccaff534d6bc14ccf767006b2d25505d0ce674
};
string tests[];