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

Fixed exe2memfile parsing of weird line in arch64d test

Browse Source
This commit is contained in:
David Harris 2021-10-30 07:26:18 -07:00
parent bd1a4769ab
commit 360930fe8b
2 changed files with 80 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wally-pipelined/bin/exe2memfile.pl
View File

@ -62,7 +62,8 @@ for(my $i=0; $i<=$#ARGV; $i++) {
}
if (/Disassembly of section .data:/) { $mode = 1;}
} elsif ($mode == 1) { # Parse data segment
if (/^\s*(\S\S\S\S\S\S\S\S):\s+(.*)/) {
# if (/^\s*(\S\S\S\S\S\S\S\S):\s+(.*)/) { # changed to \t 30 Oct 2021 dmh to fix parsing issue in d_fmadd_b17
if (/^\s*(\S\S\S\S\S\S\S\S):\t+(.*)/) {
$address = &fixadr($1);
# print "addresss $address maxaddress $maxaddress\n";
if ($address > $maxaddress) { $maxaddress = $address; }

156
wally-pipelined/testbench/tests.vh
View File

@ -640,85 +640,85 @@ string imperas32f[] = '{
string arch64d[] = '{
`RISCVARCHTEST,
"rv64i_m/D/d_fadd_b10-01", "8690",
"rv64i_m/D/d_fadd_b1-01", "8430",
"rv64i_m/D/d_fadd_b11-01", "74da0",
"rv64i_m/D/d_fadd_b12-01", "2350",
"rv64i_m/D/d_fadd_b13-01", "3cb0",
"rv64i_m/D/d_fadd_b2-01", "5160",
"rv64i_m/D/d_fadd_b3-01", "d640",
"rv64i_m/D/d_fadd_b4-01", "3900",
"rv64i_m/D/d_fadd_b5-01", "3d50",
"rv64i_m/D/d_fadd_b7-01", "5530",
"rv64i_m/D/d_fadd_b8-01", "11c10",
// "rv64i_m/D/d_fadd_b1-01", "8430",
// "rv64i_m/D/d_fadd_b11-01", "74da0",
// "rv64i_m/D/d_fadd_b12-01", "2350",
// "rv64i_m/D/d_fadd_b13-01", "3cb0",
// "rv64i_m/D/d_fadd_b2-01", "5160",
// "rv64i_m/D/d_fadd_b3-01", "d640",
// "rv64i_m/D/d_fadd_b4-01", "3900",
// "rv64i_m/D/d_fadd_b5-01", "3d50",
// "rv64i_m/D/d_fadd_b7-01", "5530",
// "rv64i_m/D/d_fadd_b8-01", "11c10",
"rv64i_m/D/d_fclass_b1-01", "2110",
"rv64i_m/D/d_fcvt.d.l_b25-01", "2110",
"rv64i_m/D/d_fcvt.d.l_b26-01", "2220",
"rv64i_m/D/d_fcvt.d.lu_b25-01", "2110",
"rv64i_m/D/d_fcvt.d.lu_b26-01", "2220",
"rv64i_m/D/d_fcvt.d.s_b1-01", "2110",
"rv64i_m/D/d_fcvt.d.s_b22-01", "2110",
"rv64i_m/D/d_fcvt.d.s_b23-01", "2110",
"rv64i_m/D/d_fcvt.d.s_b24-01", "2110",
"rv64i_m/D/d_fcvt.d.s_b27-01", "2110",
"rv64i_m/D/d_fcvt.d.s_b28-01", "2110",
"rv64i_m/D/d_fcvt.d.s_b29-01", "2110",
"rv64i_m/D/d_fcvt.d.w_b25-01", "2120",
"rv64i_m/D/d_fcvt.d.w_b26-01", "2220",
"rv64i_m/D/d_fcvt.d.wu_b25-01", "2110",
"rv64i_m/D/d_fcvt.d.wu_b26-01", "2220",
"rv64i_m/D/d_fcvt.l.d_b1-01", "2120",
"rv64i_m/D/d_fcvt.l.d_b22-01", "2260",
"rv64i_m/D/d_fcvt.l.d_b23-01", "2180",
"rv64i_m/D/d_fcvt.l.d_b24-01", "2360",
"rv64i_m/D/d_fcvt.l.d_b27-01", "2110",
"rv64i_m/D/d_fcvt.l.d_b28-01", "2120",
"rv64i_m/D/d_fcvt.l.d_b29-01", "22a0",
"rv64i_m/D/d_fcvt.lu.d_b1-01", "2120",
"rv64i_m/D/d_fcvt.lu.d_b22-01", "2260",
"rv64i_m/D/d_fcvt.lu.d_b23-01", "2180",
"rv64i_m/D/d_fcvt.lu.d_b24-01", "2360",
"rv64i_m/D/d_fcvt.lu.d_b27-01", "2120",
"rv64i_m/D/d_fcvt.lu.d_b28-01", "2120",
"rv64i_m/D/d_fcvt.lu.d_b29-01", "22a0",
"rv64i_m/D/d_fcvt.s.d_b1-01", "2110",
"rv64i_m/D/d_fcvt.s.d_b22-01", "2110",
"rv64i_m/D/d_fcvt.s.d_b23-01", "2180",
"rv64i_m/D/d_fcvt.s.d_b24-01", "2360",
"rv64i_m/D/d_fcvt.s.d_b27-01", "2110",
"rv64i_m/D/d_fcvt.s.d_b28-01", "2110",
"rv64i_m/D/d_fcvt.s.d_b29-01", "22a0",
"rv64i_m/D/d_fcvt.w.d_b1-01", "2120",
"rv64i_m/D/d_fcvt.w.d_b22-01", "2160",
"rv64i_m/D/d_fcvt.w.d_b23-01", "2180",
"rv64i_m/D/d_fcvt.w.d_b24-01", "2360",
"rv64i_m/D/d_fcvt.w.d_b27-01", "2120",
"rv64i_m/D/d_fcvt.w.d_b28-01", "2120",
"rv64i_m/D/d_fcvt.w.d_b29-01", "22a0",
"rv64i_m/D/d_fcvt.wu.d_b1-01", "2120",
"rv64i_m/D/d_fcvt.wu.d_b22-01", "2160",
"rv64i_m/D/d_fcvt.wu.d_b23-01", "2180",
"rv64i_m/D/d_fcvt.wu.d_b24-01", "2360",
"rv64i_m/D/d_fcvt.wu.d_b27-01", "2120",
"rv64i_m/D/d_fcvt.wu.d_b28-01", "2120",
"rv64i_m/D/d_fcvt.wu.d_b29-01", "22a0",
"rv64i_m/D/d_fdiv_b1-01", "8430",
"rv64i_m/D/d_fdiv_b20-01", "3fa0",
"rv64i_m/D/d_fdiv_b2-01", "5170",
"rv64i_m/D/d_fdiv_b21-01", "8a70",
"rv64i_m/D/d_fdiv_b3-01", "d630",
"rv64i_m/D/d_fdiv_b4-01", "38f0",
"rv64i_m/D/d_fdiv_b5-01", "3d50",
"rv64i_m/D/d_fdiv_b6-01", "38f0",
"rv64i_m/D/d_fdiv_b7-01", "5530",
"rv64i_m/D/d_fdiv_b8-01", "11c10",
"rv64i_m/D/d_fdiv_b9-01", "1b0f0",
"rv64i_m/D/d_feq_b1-01", "7430",
"rv64i_m/D/d_feq_b19-01", "c4c0",
"rv64i_m/D/d_fld-align-01", "2010",
"rv64i_m/D/d_fle_b1-01", "7430",
"rv64i_m/D/d_fle_b19-01", "c4c0",
"rv64i_m/D/d_flt_b1-01", "7430",
"rv64i_m/D/d_flt_b19-01", "d800",
// "rv64i_m/D/d_fcvt.d.l_b25-01", "2110",
// "rv64i_m/D/d_fcvt.d.l_b26-01", "2220",
// "rv64i_m/D/d_fcvt.d.lu_b25-01", "2110",
// "rv64i_m/D/d_fcvt.d.lu_b26-01", "2220",
// "rv64i_m/D/d_fcvt.d.s_b1-01", "2110",
// "rv64i_m/D/d_fcvt.d.s_b22-01", "2110",
// "rv64i_m/D/d_fcvt.d.s_b23-01", "2110",
// "rv64i_m/D/d_fcvt.d.s_b24-01", "2110",
// "rv64i_m/D/d_fcvt.d.s_b27-01", "2110",
// "rv64i_m/D/d_fcvt.d.s_b28-01", "2110",
// "rv64i_m/D/d_fcvt.d.s_b29-01", "2110",
// "rv64i_m/D/d_fcvt.d.w_b25-01", "2120",
// "rv64i_m/D/d_fcvt.d.w_b26-01", "2220",
// "rv64i_m/D/d_fcvt.d.wu_b25-01", "2110",
// "rv64i_m/D/d_fcvt.d.wu_b26-01", "2220",
// "rv64i_m/D/d_fcvt.l.d_b1-01", "2120",
// "rv64i_m/D/d_fcvt.l.d_b22-01", "2260",
// "rv64i_m/D/d_fcvt.l.d_b23-01", "2180",
// "rv64i_m/D/d_fcvt.l.d_b24-01", "2360",
// "rv64i_m/D/d_fcvt.l.d_b27-01", "2110",
// "rv64i_m/D/d_fcvt.l.d_b28-01", "2120",
// "rv64i_m/D/d_fcvt.l.d_b29-01", "22a0",
// "rv64i_m/D/d_fcvt.lu.d_b1-01", "2120",
// "rv64i_m/D/d_fcvt.lu.d_b22-01", "2260",
// "rv64i_m/D/d_fcvt.lu.d_b23-01", "2180",
// "rv64i_m/D/d_fcvt.lu.d_b24-01", "2360",
// "rv64i_m/D/d_fcvt.lu.d_b27-01", "2120",
// "rv64i_m/D/d_fcvt.lu.d_b28-01", "2120",
// "rv64i_m/D/d_fcvt.lu.d_b29-01", "22a0",
// "rv64i_m/D/d_fcvt.s.d_b1-01", "2110",
// "rv64i_m/D/d_fcvt.s.d_b22-01", "2110",
// "rv64i_m/D/d_fcvt.s.d_b23-01", "2180",
// "rv64i_m/D/d_fcvt.s.d_b24-01", "2360",
// "rv64i_m/D/d_fcvt.s.d_b27-01", "2110",
// "rv64i_m/D/d_fcvt.s.d_b28-01", "2110",
// "rv64i_m/D/d_fcvt.s.d_b29-01", "22a0",
// "rv64i_m/D/d_fcvt.w.d_b1-01", "2120",
// "rv64i_m/D/d_fcvt.w.d_b22-01", "2160",
// "rv64i_m/D/d_fcvt.w.d_b23-01", "2180",
// "rv64i_m/D/d_fcvt.w.d_b24-01", "2360",
// "rv64i_m/D/d_fcvt.w.d_b27-01", "2120",
// "rv64i_m/D/d_fcvt.w.d_b28-01", "2120",
// "rv64i_m/D/d_fcvt.w.d_b29-01", "22a0",
// "rv64i_m/D/d_fcvt.wu.d_b1-01", "2120",
// "rv64i_m/D/d_fcvt.wu.d_b22-01", "2160",
// "rv64i_m/D/d_fcvt.wu.d_b23-01", "2180",
// "rv64i_m/D/d_fcvt.wu.d_b24-01", "2360",
// "rv64i_m/D/d_fcvt.wu.d_b27-01", "2120",
// "rv64i_m/D/d_fcvt.wu.d_b28-01", "2120",
// "rv64i_m/D/d_fcvt.wu.d_b29-01", "22a0",
// "rv64i_m/D/d_fdiv_b1-01", "8430",
// "rv64i_m/D/d_fdiv_b20-01", "3fa0",
// "rv64i_m/D/d_fdiv_b2-01", "5170",
// "rv64i_m/D/d_fdiv_b21-01", "8a70",
// "rv64i_m/D/d_fdiv_b3-01", "d630",
// "rv64i_m/D/d_fdiv_b4-01", "38f0",
// "rv64i_m/D/d_fdiv_b5-01", "3d50",
// "rv64i_m/D/d_fdiv_b6-01", "38f0",
// "rv64i_m/D/d_fdiv_b7-01", "5530",
// "rv64i_m/D/d_fdiv_b8-01", "11c10",
// "rv64i_m/D/d_fdiv_b9-01", "1b0f0",
// "rv64i_m/D/d_feq_b1-01", "7430",
// "rv64i_m/D/d_feq_b19-01", "c4c0",
// "rv64i_m/D/d_fld-align-01", "2010",
// "rv64i_m/D/d_fle_b1-01", "7430",
// "rv64i_m/D/d_fle_b19-01", "c4c0",
// "rv64i_m/D/d_flt_b1-01", "7430",
// "rv64i_m/D/d_flt_b19-01", "d800",
"rv64i_m/D/d_fmadd_b14-01", "3fd0",
"rv64i_m/D/d_fmadd_b16-01", "43b0",
"rv64i_m/D/d_fmadd_b17-01", "43b0",