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

Fixed merge conflict stuff

Browse Source
This commit is contained in:
ethan-falicov 2021-02-10 10:03:30 -05:00
parent 06517631cc
commit 7925fe3131
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,7 +145,7 @@ string tests64iNOc[] = {
"rv64i/WALLY-SLTIU", "3000", "rv64i/WALLY-SLTIU", "3000",
"rv64i/WALLY-SLLI", "3000", "rv64i/WALLY-SLLI", "3000",
"rv64i/WALLY-SRLI", "3000", "rv64i/WALLY-SRLI", "3000",
"rv64i/WALLY-SRAI", "3000" "rv64i/WALLY-SRAI", "3000",
"rv64i/WALLY-LOAD", "11bf0", "rv64i/WALLY-LOAD", "11bf0",
"rv64i/WALLY-JAL", "4000", "rv64i/WALLY-JAL", "4000",
"rv64i/WALLY-STORE", "3000", "rv64i/WALLY-STORE", "3000",
@ -242,14 +242,13 @@ string tests32i[] = {
"rv32i/WALLY-SLTIU", "2000", "rv32i/WALLY-SLTIU", "2000",
"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"
}; };
string tests[]; string tests[];
logic [`AHBW-1:0] HRDATAEXT; logic [`AHBW-1:0] HRDATAEXT;
logic HREADYEXT, HRESPEXT; logic HREADYEXT, HRESPEXT;
logic [31:0] HADDR; logic [31:0] HADDR;