From a7cfda8e521c0d5b12a2024073de01d344d609ed Mon Sep 17 00:00:00 2001
From: David Harris <david_harris@hmc.edu>
Date: Sun, 26 Dec 2021 04:36:53 +0000
Subject: [PATCH] Incorporated new Imperas tests.  f and d tests are failing
 and c tests are hanging.

---
 .../regression/regression-wally.py            |    4 +-
 wally-pipelined/regression/sim-wally-batch    |    2 +-
 wally-pipelined/testbench/testbench.sv        |    1 +
 wally-pipelined/testbench/tests.vh            | 1093 +++++++++++------
 4 files changed, 695 insertions(+), 405 deletions(-)

diff --git a/wally-pipelined/regression/regression-wally.py b/wally-pipelined/regression/regression-wally.py
index 9aa1c1d12..c977ea6b2 100755
--- a/wally-pipelined/regression/regression-wally.py
+++ b/wally-pipelined/regression/regression-wally.py
@@ -49,7 +49,7 @@ tc = TestCase(
       grepstr="400100000 instructions")
 configs.append(tc)
 
-tests64 = ["wally64i", "arch64i", "arch64priv", "arch64c",  "arch64m", "imperas64i", "imperas64p", "imperas64mmu", "imperas64m", "imperas64a",  "imperas64c"] #,  "testsBP64"] /*"imperas64f", "imperas64d",*/ 
+tests64 = ["wally64i", "arch64i", "arch64priv", "arch64c",  "arch64m", "imperas64i", "imperas64f", "imperas64d", "imperas64p", "imperas64mmu", "imperas64m", "imperas64a",  "imperas64c"] #,  "testsBP64"] 
 for test in tests64:
   tc = TestCase(
         name=test,
@@ -57,7 +57,7 @@ for test in tests64:
         grepstr="All tests ran without failures")
   configs.append(tc)
 #tests32 = ["arch32i", "arch32priv", "arch32c",  "arch32m", "arch32f", "imperas32i", "imperas32p", "imperas32mmu", "imperas32f", "imperas32m", "imperas32a",  "imperas32c"]
-tests32 = ["wally32i", "arch32i", "arch32priv", "arch32c",  "arch32m", "imperas32i", "imperas32p", "imperas32mmu", "imperas32m", "imperas32a",  "imperas32c"] # /*"imperas32f", */ 
+tests32 = ["wally32i", "arch32i", "arch32priv", "arch32c",  "arch32m", "imperas32i", "imperas32f", "imperas32p", "imperas32mmu", "imperas32m", "imperas32a",  "imperas32c"] 
 for test in tests32:
   tc = TestCase(
         name=test,
diff --git a/wally-pipelined/regression/sim-wally-batch b/wally-pipelined/regression/sim-wally-batch
index 73ad1d838..86bb6142f 100755
--- a/wally-pipelined/regression/sim-wally-batch
+++ b/wally-pipelined/regression/sim-wally-batch
@@ -1,3 +1,3 @@
 vsim -c <<!
-do wally-pipelined-batch.do rv64gc imperas64i
+do wally-pipelined-batch.do rv64gc imperas64c
 !
diff --git a/wally-pipelined/testbench/testbench.sv b/wally-pipelined/testbench/testbench.sv
index b98baac5b..68bd1e936 100644
--- a/wally-pipelined/testbench/testbench.sv
+++ b/wally-pipelined/testbench/testbench.sv
@@ -198,6 +198,7 @@ logic [3:0] dummy;
   always
     begin
       clk = 1; # 5; clk = 0; # 5;
+      if ($time % 100000 == 0) $display("Time is %0t", $time);
     end
    
   // check results
diff --git a/wally-pipelined/testbench/tests.vh b/wally-pipelined/testbench/tests.vh
index 68f562c1c..a3673d372 100644
--- a/wally-pipelined/testbench/tests.vh
+++ b/wally-pipelined/testbench/tests.vh
@@ -35,6 +35,18 @@ string tvpaths[] = '{
     "../../tests/imperas-riscv-tests/work/"
 };
 
+  string imperas64a[] = '{
+    `MYIMPERASTEST,
+    "rv64a/WALLY-AMO", "2110",
+    "rv64a/WALLY-LRSC", "2110"
+  };
+
+    string imperas32a[] = '{
+    `MYIMPERASTEST,
+    "rv32a/WALLY-AMO", "2110",
+    "rv32a/WALLY-LRSC", "2110"
+  };
+
   string imperas32mmu[] = '{
     `MYIMPERASTEST, 
     "rv32mmu/WALLY-MMU-SV32", "3000"
@@ -50,168 +62,619 @@ string tvpaths[] = '{
     //"rv64mmu/WALLY-PMA", "3000"
   };
 
+  // *** restore CSR tests from Imperas old
+
+    string extra64i[] = '{
+    `MYIMPERASTEST,
+    "rv64i_m/I/WALLY-ADD", "4000",
+    "rv64i_m/I/WALLY-SUB", "4000",
+    "rv64i_m/I/WALLY-ADDI", "3000",
+    "rv64i_m/I/WALLY-ANDI", "3000",
+    "rv64i_m/I/WALLY-ORI", "3000",
+    "rv64i_m/I/WALLY-XORI", "3000",
+    "rv64i_m/I/WALLY-SLTI", "3000",
+    "rv64i_m/I/WALLY-SLTIU", "3000",
+    "rv64i_m/I/WALLY-SLLI", "3000",
+    "rv64i_m/I/WALLY-SRLI", "3000",
+    "rv64i_m/I/WALLY-SRAI", "3000",
+    "rv64i_m/I/WALLY-JAL", "4000",
+    "rv64i_m/I/WALLY-JALR", "3000",
+    "rv64i_m/I/WALLY-STORE", "3000",
+    "rv64i_m/I/WALLY-ADDIW", "3000",
+    "rv64i_m/I/WALLY-SLLIW", "3000",
+    "rv64i_m/I/WALLY-SRLIW", "3000",
+    "rv64i_m/I/WALLY-SRAIW", "3000",
+    "rv64i_m/I/WALLY-ADDW", "4000",
+    "rv64i_m/I/WALLY-SUBW", "4000",
+    "rv64i_m/I/WALLY-SLLW", "3000",
+    "rv64i_m/I/WALLY-SRLW", "3000",
+    "rv64i_m/I/WALLY-SRAW", "3000",
+    "rv64i_m/I/WALLY-BEQ" ,"5000",
+    "rv64i_m/I/WALLY-BNE", "5000 ",
+    "rv64i_m/I/WALLY-BLTU", "5000 ",
+    "rv64i_m/I/WALLY-BLT", "5000",
+    "rv64i_m/I/WALLY-BGE", "5000 ",
+    "rv64i_m/I/WALLY-BGEU", "5000 ",
+    "rv64i_m/I/WALLY-CSRRW", "4000",
+    "rv64i_m/I/WALLY-CSRRS", "4000",
+    "rv64i_m/I/WALLY-CSRRC", "5000",
+    "rv64i_m/I/WALLY-CSRRWI", "4000",
+    "rv64i_m/I/WALLY-CSRRSI", "4000",
+    "rv64i_m/I/WALLY-CSRRCI", "4000" 
+  };
+
   
 string imperas32f[] = '{
     `IMPERASTEST,
-    "rv32i_m/F/I-FADD-S-01", "2000",
-    "rv32i_m/F/I-FCLASS-S-01", "2000",
-    "rv32i_m/F/I-FCVT-S-W-01", "2000",
-    "rv32i_m/F/I-FCVT-S-WU-01", "2000",
-    "rv32i_m/F/I-FCVT-W-S-01", "2000",
-    "rv32i_m/F/I-FCVT-WU-S-01", "2000",
-    "rv32i_m/F/I-FDIV-S-01", "2000",
-    "rv32i_m/F/I-FEQ-S-01", "2000",
-    "rv32i_m/F/I-FLE-S-01", "2000",
-    "rv32i_m/F/I-FLT-S-01", "2000",
-    "rv32i_m/F/I-FMADD-S-01", "2000",
-    "rv32i_m/F/I-FMAX-S-01", "2000",
-    "rv32i_m/F/I-FMIN-S-01", "2000",
-    "rv32i_m/F/I-FMSUB-S-01", "2000",
-    "rv32i_m/F/I-FMUL-S-01", "2000",
-    "rv32i_m/F/I-FMV-W-X-01", "2000",
-    "rv32i_m/F/I-FMV-X-W-01", "2000",
-    "rv32i_m/F/I-FNMADD-S-01", "2000",
-    "rv32i_m/F/I-FNMSUB-S-01", "2000",
-    "rv32i_m/F/I-FSGNJ-S-01", "2000",
-    "rv32i_m/F/I-FSGNJN-S-01", "2000",
-    "rv32i_m/F/I-FSGNJX-S-01", "2000",
-    "rv32i_m/F/I-FSQRT-S-01", "2000",
-    "rv32i_m/F/I-FSW-01", "2000",
-    "rv32i_m/F/I-FLW-01", "2110",
-    "rv32i_m/F/I-FSUB-S-01", "2000"
+    "rv32i_m/F/FADD-S-DYN-RDN-01", "002010",
+		"rv32i_m/F/FADD-S-DYN-RMM-01", "002010",
+		"rv32i_m/F/FADD-S-DYN-RNE-01", "002010",
+		"rv32i_m/F/FADD-S-DYN-RTZ-01", "002010",
+		"rv32i_m/F/FADD-S-DYN-RUP-01", "002010",
+		"rv32i_m/F/FADD-S-RDN-01", "002010",
+		"rv32i_m/F/FADD-S-RMM-01", "002010",
+		"rv32i_m/F/FADD-S-RNE-01", "002010",
+		"rv32i_m/F/FADD-S-RTZ-01", "002010",
+		"rv32i_m/F/FADD-S-RUP-01", "002010",
+		"rv32i_m/F/FCLASS-S-01", "002010",
+		"rv32i_m/F/FCVT-S-W-DYN-RDN-01", "002010",
+		"rv32i_m/F/FCVT-S-W-DYN-RMM-01", "002010",
+		"rv32i_m/F/FCVT-S-W-DYN-RNE-01", "002010",
+		"rv32i_m/F/FCVT-S-W-DYN-RTZ-01", "002010",
+		"rv32i_m/F/FCVT-S-W-DYN-RUP-01", "002010",
+		"rv32i_m/F/FCVT-S-W-RDN-01", "002010",
+		"rv32i_m/F/FCVT-S-W-RMM-01", "002010",
+		"rv32i_m/F/FCVT-S-W-RNE-01", "002010",
+		"rv32i_m/F/FCVT-S-W-RTZ-01", "002010",
+		"rv32i_m/F/FCVT-S-W-RUP-01", "002010",
+		"rv32i_m/F/FCVT-S-WU-DYN-RDN-01", "002010",
+		"rv32i_m/F/FCVT-S-WU-DYN-RMM-01", "002010",
+		"rv32i_m/F/FCVT-S-WU-DYN-RNE-01", "002010",
+		"rv32i_m/F/FCVT-S-WU-DYN-RTZ-01", "002010",
+		"rv32i_m/F/FCVT-S-WU-DYN-RUP-01", "002010",
+		"rv32i_m/F/FCVT-S-WU-RDN-01", "002010",
+		"rv32i_m/F/FCVT-S-WU-RMM-01", "002010",
+		"rv32i_m/F/FCVT-S-WU-RNE-01", "002010",
+		"rv32i_m/F/FCVT-S-WU-RTZ-01", "002010",
+		"rv32i_m/F/FCVT-S-WU-RUP-01", "002010",
+		"rv32i_m/F/FCVT-W-S-DYN-RDN-01", "002010",
+		"rv32i_m/F/FCVT-W-S-DYN-RMM-01", "002010",
+		"rv32i_m/F/FCVT-W-S-DYN-RNE-01", "002010",
+		"rv32i_m/F/FCVT-W-S-DYN-RTZ-01", "002010",
+		"rv32i_m/F/FCVT-W-S-DYN-RUP-01", "002010",
+		"rv32i_m/F/FCVT-W-S-RDN-01", "002010",
+		"rv32i_m/F/FCVT-W-S-RMM-01", "002010",
+		"rv32i_m/F/FCVT-W-S-RNE-01", "002010",
+		"rv32i_m/F/FCVT-W-S-RTZ-01", "002010",
+		"rv32i_m/F/FCVT-W-S-RUP-01", "002010",
+		"rv32i_m/F/FCVT-WU-S-DYN-RDN-01", "002010",
+		"rv32i_m/F/FCVT-WU-S-DYN-RMM-01", "002010",
+		"rv32i_m/F/FCVT-WU-S-DYN-RNE-01", "002010",
+		"rv32i_m/F/FCVT-WU-S-DYN-RTZ-01", "002010",
+		"rv32i_m/F/FCVT-WU-S-DYN-RUP-01", "002010",
+		"rv32i_m/F/FCVT-WU-S-RDN-01", "002010",
+		"rv32i_m/F/FCVT-WU-S-RMM-01", "002010",
+		"rv32i_m/F/FCVT-WU-S-RNE-01", "002010",
+		"rv32i_m/F/FCVT-WU-S-RTZ-01", "002010",
+		"rv32i_m/F/FCVT-WU-S-RUP-01", "002010",
+		"rv32i_m/F/FDIV-S-DYN-RDN-01", "002010",
+		"rv32i_m/F/FDIV-S-DYN-RMM-01", "002010",
+		"rv32i_m/F/FDIV-S-DYN-RNE-01", "002010",
+		"rv32i_m/F/FDIV-S-DYN-RTZ-01", "002010",
+		"rv32i_m/F/FDIV-S-DYN-RUP-01", "002010",
+		"rv32i_m/F/FDIV-S-RDN-01", "002010",
+		"rv32i_m/F/FDIV-S-RMM-01", "002010",
+		"rv32i_m/F/FDIV-S-RNE-01", "002010",
+		"rv32i_m/F/FDIV-S-RTZ-01", "002010",
+		"rv32i_m/F/FDIV-S-RUP-01", "002010",
+		"rv32i_m/F/FEQ-S-01", "002010",
+		"rv32i_m/F/FLE-S-01", "002010",
+		"rv32i_m/F/FLT-S-01", "002010",
+		"rv32i_m/F/FLW-01", "002120",
+		"rv32i_m/F/FMADD-S-DYN-RDN-01", "002010",
+		"rv32i_m/F/FMADD-S-DYN-RMM-01", "002010",
+		"rv32i_m/F/FMADD-S-DYN-RNE-01", "002010",
+		"rv32i_m/F/FMADD-S-DYN-RTZ-01", "002010",
+		"rv32i_m/F/FMADD-S-DYN-RUP-01", "002010",
+		"rv32i_m/F/FMADD-S-RDN-01", "002010",
+		"rv32i_m/F/FMADD-S-RMM-01", "002010",
+		"rv32i_m/F/FMADD-S-RNE-01", "002010",
+		"rv32i_m/F/FMADD-S-RTZ-01", "002010",
+		"rv32i_m/F/FMADD-S-RUP-01", "002010",
+		"rv32i_m/F/FMAX-S-01", "002010",
+		"rv32i_m/F/FMIN-S-01", "002010",
+		"rv32i_m/F/FMSUB-S-DYN-RDN-01", "002010",
+		"rv32i_m/F/FMSUB-S-DYN-RMM-01", "002010",
+		"rv32i_m/F/FMSUB-S-DYN-RNE-01", "002010",
+		"rv32i_m/F/FMSUB-S-DYN-RTZ-01", "002010",
+		"rv32i_m/F/FMSUB-S-DYN-RUP-01", "002010",
+		"rv32i_m/F/FMSUB-S-RDN-01", "002010",
+		"rv32i_m/F/FMSUB-S-RMM-01", "002010",
+		"rv32i_m/F/FMSUB-S-RNE-01", "002010",
+		"rv32i_m/F/FMSUB-S-RTZ-01", "002010",
+		"rv32i_m/F/FMSUB-S-RUP-01", "002010",
+		"rv32i_m/F/FMUL-S-DYN-RDN-01", "002010",
+		"rv32i_m/F/FMUL-S-DYN-RMM-01", "002010",
+		"rv32i_m/F/FMUL-S-DYN-RNE-01", "002010",
+		"rv32i_m/F/FMUL-S-DYN-RTZ-01", "002010",
+		"rv32i_m/F/FMUL-S-DYN-RUP-01", "002010",
+		"rv32i_m/F/FMUL-S-RDN-01", "002010",
+		"rv32i_m/F/FMUL-S-RMM-01", "002010",
+		"rv32i_m/F/FMUL-S-RNE-01", "002010",
+		"rv32i_m/F/FMUL-S-RTZ-01", "002010",
+		"rv32i_m/F/FMUL-S-RUP-01", "002010",
+		"rv32i_m/F/FMV-W-X-01", "002010",
+		"rv32i_m/F/FMV-X-W-01", "002010",
+		"rv32i_m/F/FNMADD-S-DYN-RDN-01", "002010",
+		"rv32i_m/F/FNMADD-S-DYN-RMM-01", "002010",
+		"rv32i_m/F/FNMADD-S-DYN-RNE-01", "002010",
+		"rv32i_m/F/FNMADD-S-DYN-RTZ-01", "002010",
+		"rv32i_m/F/FNMADD-S-DYN-RUP-01", "002010",
+		"rv32i_m/F/FNMADD-S-RDN-01", "002010",
+		"rv32i_m/F/FNMADD-S-RMM-01", "002010",
+		"rv32i_m/F/FNMADD-S-RNE-01", "002010",
+		"rv32i_m/F/FNMADD-S-RTZ-01", "002010",
+		"rv32i_m/F/FNMADD-S-RUP-01", "002010",
+		"rv32i_m/F/FNMSUB-S-DYN-RDN-01", "002010",
+		"rv32i_m/F/FNMSUB-S-DYN-RMM-01", "002010",
+		"rv32i_m/F/FNMSUB-S-DYN-RNE-01", "002010",
+		"rv32i_m/F/FNMSUB-S-DYN-RTZ-01", "002010",
+		"rv32i_m/F/FNMSUB-S-DYN-RUP-01", "002010",
+		"rv32i_m/F/FNMSUB-S-RDN-01", "002010",
+		"rv32i_m/F/FNMSUB-S-RMM-01", "002010",
+		"rv32i_m/F/FNMSUB-S-RNE-01", "002010",
+		"rv32i_m/F/FNMSUB-S-RTZ-01", "002010",
+		"rv32i_m/F/FNMSUB-S-RUP-01", "002010",
+		"rv32i_m/F/FSGNJN-S-01", "002010",
+		"rv32i_m/F/FSGNJ-S-01", "002010",
+		"rv32i_m/F/FSGNJX-S-01", "002010",
+		"rv32i_m/F/FSQRT-S-DYN-RDN-01", "002010",
+		"rv32i_m/F/FSQRT-S-DYN-RMM-01", "002010",
+		"rv32i_m/F/FSQRT-S-DYN-RNE-01", "002010",
+		"rv32i_m/F/FSQRT-S-DYN-RTZ-01", "002010",
+		"rv32i_m/F/FSQRT-S-DYN-RUP-01", "002010",
+		"rv32i_m/F/FSQRT-S-RDN-01", "002010",
+		"rv32i_m/F/FSQRT-S-RMM-01", "002010",
+		"rv32i_m/F/FSQRT-S-RNE-01", "002010",
+		"rv32i_m/F/FSQRT-S-RTZ-01", "002010",
+		"rv32i_m/F/FSQRT-S-RUP-01", "002010",
+		"rv32i_m/F/FSUB-S-DYN-RDN-01", "002010",
+		"rv32i_m/F/FSUB-S-DYN-RMM-01", "002010",
+		"rv32i_m/F/FSUB-S-DYN-RNE-01", "002010",
+		"rv32i_m/F/FSUB-S-DYN-RTZ-01", "002010",
+		"rv32i_m/F/FSUB-S-DYN-RUP-01", "002010",
+		"rv32i_m/F/FSUB-S-RDN-01", "002010",
+		"rv32i_m/F/FSUB-S-RMM-01", "002010",
+		"rv32i_m/F/FSUB-S-RNE-01", "002010",
+		"rv32i_m/F/FSUB-S-RTZ-01", "002010",
+		"rv32i_m/F/FSUB-S-RUP-01", "002010",
+		"rv32i_m/F/FSW-01", "002010"
   };
 
   string imperas64f[] = '{
     `IMPERASTEST,
-    "rv64i_m/F/I-FLW-01", "2110",
-    "rv64i_m/F/I-FMV-W-X-01", "2000",
-    "rv64i_m/F/I-FMV-X-W-01", "2000",
-    "rv64i_m/F/I-FSW-01", "2000",
-    "rv64i_m/F/I-FCLASS-S-01", "2000",
-    "rv64i_m/F/I-FADD-S-01", "2000",
-   "rv64i_m/F/I-FCVT-S-L-01", "2000",
-   "rv64i_m/F/I-FCVT-S-LU-01", "2000",
-   "rv64i_m/F/I-FCVT-S-W-01", "2000",
-   "rv64i_m/F/I-FCVT-S-WU-01", "2000",
-    "rv64i_m/F/I-FCVT-L-S-01", "2000",
-    "rv64i_m/F/I-FCVT-LU-S-01", "2000",
-    "rv64i_m/F/I-FCVT-W-S-01", "2000",
-    "rv64i_m/F/I-FCVT-WU-S-01", "2000",
-    "rv64i_m/F/I-FDIV-S-01", "2000",
-    "rv64i_m/F/I-FEQ-S-01", "2000",
-    "rv64i_m/F/I-FLE-S-01", "2000",
-    "rv64i_m/F/I-FLT-S-01", "2000",
-    "rv64i_m/F/I-FMADD-S-01", "2000",
-    "rv64i_m/F/I-FMAX-S-01", "2000",
-    "rv64i_m/F/I-FMIN-S-01", "2000",
-    "rv64i_m/F/I-FMSUB-S-01", "2000",
-    "rv64i_m/F/I-FMUL-S-01", "2000",
-    "rv64i_m/F/I-FNMADD-S-01", "2000",
-    "rv64i_m/F/I-FNMSUB-S-01", "2000",
-    "rv64i_m/F/I-FSGNJ-S-01", "2000",
-    "rv64i_m/F/I-FSGNJN-S-01", "2000",
-    "rv64i_m/F/I-FSGNJX-S-01", "2000",
-    "rv64i_m/F/I-FSQRT-S-01", "2000",
-    "rv64i_m/F/I-FSUB-S-01", "2000"
+		"rv64i_m/F/FADD-S-DYN-RDN-01", "002010",
+		"rv64i_m/F/FADD-S-DYN-RMM-01", "002010",
+		"rv64i_m/F/FADD-S-DYN-RNE-01", "002010",
+		"rv64i_m/F/FADD-S-DYN-RTZ-01", "002010",
+		"rv64i_m/F/FADD-S-DYN-RUP-01", "002010",
+		"rv64i_m/F/FADD-S-RDN-01", "002010",
+		"rv64i_m/F/FADD-S-RMM-01", "002010",
+		"rv64i_m/F/FADD-S-RNE-01", "002010",
+		"rv64i_m/F/FADD-S-RTZ-01", "002010",
+		"rv64i_m/F/FADD-S-RUP-01", "002010",
+		"rv64i_m/F/FCLASS-S-01", "002010",
+		"rv64i_m/F/FCVT-L-S-DYN-RDN-01", "002010",
+		"rv64i_m/F/FCVT-L-S-DYN-RMM-01", "002010",
+		"rv64i_m/F/FCVT-L-S-DYN-RNE-01", "002010",
+		"rv64i_m/F/FCVT-L-S-DYN-RTZ-01", "002010",
+		"rv64i_m/F/FCVT-L-S-DYN-RUP-01", "002010",
+		"rv64i_m/F/FCVT-L-S-RDN-01", "002010",
+		"rv64i_m/F/FCVT-L-S-RMM-01", "002010",
+		"rv64i_m/F/FCVT-L-S-RNE-01", "002010",
+		"rv64i_m/F/FCVT-L-S-RTZ-01", "002010",
+		"rv64i_m/F/FCVT-L-S-RUP-01", "002010",
+		"rv64i_m/F/FCVT-LU-S-DYN-RDN-01", "002010",
+		"rv64i_m/F/FCVT-LU-S-DYN-RMM-01", "002010",
+		"rv64i_m/F/FCVT-LU-S-DYN-RNE-01", "002010",
+		"rv64i_m/F/FCVT-LU-S-DYN-RTZ-01", "002010",
+		"rv64i_m/F/FCVT-LU-S-DYN-RUP-01", "002010",
+		"rv64i_m/F/FCVT-LU-S-RDN-01", "002010",
+		"rv64i_m/F/FCVT-LU-S-RMM-01", "002010",
+		"rv64i_m/F/FCVT-LU-S-RNE-01", "002010",
+		"rv64i_m/F/FCVT-LU-S-RTZ-01", "002010",
+		"rv64i_m/F/FCVT-LU-S-RUP-01", "002010",
+		"rv64i_m/F/FCVT-S-L-DYN-RDN-01", "002010",
+		"rv64i_m/F/FCVT-S-L-DYN-RMM-01", "002010",
+		"rv64i_m/F/FCVT-S-L-DYN-RNE-01", "002010",
+		"rv64i_m/F/FCVT-S-L-DYN-RTZ-01", "002010",
+		"rv64i_m/F/FCVT-S-L-DYN-RUP-01", "002010",
+		"rv64i_m/F/FCVT-S-L-RDN-01", "002010",
+		"rv64i_m/F/FCVT-S-L-RMM-01", "002010",
+		"rv64i_m/F/FCVT-S-L-RNE-01", "002010",
+		"rv64i_m/F/FCVT-S-L-RTZ-01", "002010",
+		"rv64i_m/F/FCVT-S-L-RUP-01", "002010",
+		"rv64i_m/F/FCVT-S-LU-DYN-RDN-01", "002010",
+		"rv64i_m/F/FCVT-S-LU-DYN-RMM-01", "002010",
+		"rv64i_m/F/FCVT-S-LU-DYN-RNE-01", "002010",
+		"rv64i_m/F/FCVT-S-LU-DYN-RTZ-01", "002010",
+		"rv64i_m/F/FCVT-S-LU-DYN-RUP-01", "002010",
+		"rv64i_m/F/FCVT-S-LU-RDN-01", "002010",
+		"rv64i_m/F/FCVT-S-LU-RMM-01", "002010",
+		"rv64i_m/F/FCVT-S-LU-RNE-01", "002010",
+		"rv64i_m/F/FCVT-S-LU-RTZ-01", "002010",
+		"rv64i_m/F/FCVT-S-LU-RUP-01", "002010",
+		"rv64i_m/F/FCVT-S-W-DYN-RDN-01", "002010",
+		"rv64i_m/F/FCVT-S-W-DYN-RMM-01", "002010",
+		"rv64i_m/F/FCVT-S-W-DYN-RNE-01", "002010",
+		"rv64i_m/F/FCVT-S-W-DYN-RTZ-01", "002010",
+		"rv64i_m/F/FCVT-S-W-DYN-RUP-01", "002010",
+		"rv64i_m/F/FCVT-S-W-RDN-01", "002010",
+		"rv64i_m/F/FCVT-S-W-RMM-01", "002010",
+		"rv64i_m/F/FCVT-S-W-RNE-01", "002010",
+		"rv64i_m/F/FCVT-S-W-RTZ-01", "002010",
+		"rv64i_m/F/FCVT-S-W-RUP-01", "002010",
+		"rv64i_m/F/FCVT-S-WU-DYN-RDN-01", "002010",
+		"rv64i_m/F/FCVT-S-WU-DYN-RMM-01", "002010",
+		"rv64i_m/F/FCVT-S-WU-DYN-RNE-01", "002010",
+		"rv64i_m/F/FCVT-S-WU-DYN-RTZ-01", "002010",
+		"rv64i_m/F/FCVT-S-WU-DYN-RUP-01", "002010",
+		"rv64i_m/F/FCVT-S-WU-RDN-01", "002010",
+		"rv64i_m/F/FCVT-S-WU-RMM-01", "002010",
+		"rv64i_m/F/FCVT-S-WU-RNE-01", "002010",
+		"rv64i_m/F/FCVT-S-WU-RTZ-01", "002010",
+		"rv64i_m/F/FCVT-S-WU-RUP-01", "002010",
+		"rv64i_m/F/FCVT-W-S-DYN-RDN-01", "002010",
+		"rv64i_m/F/FCVT-W-S-DYN-RMM-01", "002010",
+		"rv64i_m/F/FCVT-W-S-DYN-RNE-01", "002010",
+		"rv64i_m/F/FCVT-W-S-DYN-RTZ-01", "002010",
+		"rv64i_m/F/FCVT-W-S-DYN-RUP-01", "002010",
+		"rv64i_m/F/FCVT-W-S-RDN-01", "002010",
+		"rv64i_m/F/FCVT-W-S-RMM-01", "002010",
+		"rv64i_m/F/FCVT-W-S-RNE-01", "002010",
+		"rv64i_m/F/FCVT-W-S-RTZ-01", "002010",
+		"rv64i_m/F/FCVT-W-S-RUP-01", "002010",
+		"rv64i_m/F/FCVT-WU-S-DYN-RDN-01", "002010",
+		"rv64i_m/F/FCVT-WU-S-DYN-RMM-01", "002010",
+		"rv64i_m/F/FCVT-WU-S-DYN-RNE-01", "002010",
+		"rv64i_m/F/FCVT-WU-S-DYN-RTZ-01", "002010",
+		"rv64i_m/F/FCVT-WU-S-DYN-RUP-01", "002010",
+		"rv64i_m/F/FCVT-WU-S-RDN-01", "002010",
+		"rv64i_m/F/FCVT-WU-S-RMM-01", "002010",
+		"rv64i_m/F/FCVT-WU-S-RNE-01", "002010",
+		"rv64i_m/F/FCVT-WU-S-RTZ-01", "002010",
+		"rv64i_m/F/FCVT-WU-S-RUP-01", "002010",
+		"rv64i_m/F/FDIV-S-DYN-RDN-01", "002010",
+		"rv64i_m/F/FDIV-S-DYN-RMM-01", "002010",
+		"rv64i_m/F/FDIV-S-DYN-RNE-01", "002010",
+		"rv64i_m/F/FDIV-S-DYN-RTZ-01", "002010",
+		"rv64i_m/F/FDIV-S-DYN-RUP-01", "002010",
+		"rv64i_m/F/FDIV-S-RDN-01", "002010",
+		"rv64i_m/F/FDIV-S-RMM-01", "002010",
+		"rv64i_m/F/FDIV-S-RNE-01", "002010",
+		"rv64i_m/F/FDIV-S-RTZ-01", "002010",
+		"rv64i_m/F/FDIV-S-RUP-01", "002010",
+		"rv64i_m/F/FEQ-S-01", "002010",
+		"rv64i_m/F/FLE-S-01", "002010",
+		"rv64i_m/F/FLT-S-01", "002010",
+		"rv64i_m/F/FLW-01", "002210",
+		"rv64i_m/F/FMADD-S-DYN-RDN-01", "002010",
+		"rv64i_m/F/FMADD-S-DYN-RMM-01", "002010",
+		"rv64i_m/F/FMADD-S-DYN-RNE-01", "002010",
+		"rv64i_m/F/FMADD-S-DYN-RTZ-01", "002010",
+		"rv64i_m/F/FMADD-S-DYN-RUP-01", "002010",
+		"rv64i_m/F/FMADD-S-RDN-01", "002010",
+		"rv64i_m/F/FMADD-S-RMM-01", "002010",
+		"rv64i_m/F/FMADD-S-RNE-01", "002010",
+		"rv64i_m/F/FMADD-S-RTZ-01", "002010",
+		"rv64i_m/F/FMADD-S-RUP-01", "002010",
+		"rv64i_m/F/FMAX-S-01", "002010",
+		"rv64i_m/F/FMIN-S-01", "002010",
+		"rv64i_m/F/FMSUB-S-DYN-RDN-01", "002010",
+		"rv64i_m/F/FMSUB-S-DYN-RMM-01", "002010",
+		"rv64i_m/F/FMSUB-S-DYN-RNE-01", "002010",
+		"rv64i_m/F/FMSUB-S-DYN-RTZ-01", "002010",
+		"rv64i_m/F/FMSUB-S-DYN-RUP-01", "002010",
+		"rv64i_m/F/FMSUB-S-RDN-01", "002010",
+		"rv64i_m/F/FMSUB-S-RMM-01", "002010",
+		"rv64i_m/F/FMSUB-S-RNE-01", "002010",
+		"rv64i_m/F/FMSUB-S-RTZ-01", "002010",
+		"rv64i_m/F/FMSUB-S-RUP-01", "002010",
+		"rv64i_m/F/FMUL-S-DYN-RDN-01", "002010",
+		"rv64i_m/F/FMUL-S-DYN-RMM-01", "002010",
+		"rv64i_m/F/FMUL-S-DYN-RNE-01", "002010",
+		"rv64i_m/F/FMUL-S-DYN-RTZ-01", "002010",
+		"rv64i_m/F/FMUL-S-DYN-RUP-01", "002010",
+		"rv64i_m/F/FMUL-S-RDN-01", "002010",
+		"rv64i_m/F/FMUL-S-RMM-01", "002010",
+		"rv64i_m/F/FMUL-S-RNE-01", "002010",
+		"rv64i_m/F/FMUL-S-RTZ-01", "002010",
+		"rv64i_m/F/FMUL-S-RUP-01", "002010",
+		"rv64i_m/F/FMV-W-X-01", "002010",
+		"rv64i_m/F/FMV-X-W-01", "002010",
+		"rv64i_m/F/FNMADD-S-DYN-RDN-01", "002010",
+		"rv64i_m/F/FNMADD-S-DYN-RMM-01", "002010",
+		"rv64i_m/F/FNMADD-S-DYN-RNE-01", "002010",
+		"rv64i_m/F/FNMADD-S-DYN-RTZ-01", "002010",
+		"rv64i_m/F/FNMADD-S-DYN-RUP-01", "002010",
+		"rv64i_m/F/FNMADD-S-RDN-01", "002010",
+		"rv64i_m/F/FNMADD-S-RMM-01", "002010",
+		"rv64i_m/F/FNMADD-S-RNE-01", "002010",
+		"rv64i_m/F/FNMADD-S-RTZ-01", "002010",
+		"rv64i_m/F/FNMADD-S-RUP-01", "002010",
+		"rv64i_m/F/FNMSUB-S-DYN-RDN-01", "002010",
+		"rv64i_m/F/FNMSUB-S-DYN-RMM-01", "002010",
+		"rv64i_m/F/FNMSUB-S-DYN-RNE-01", "002010",
+		"rv64i_m/F/FNMSUB-S-DYN-RTZ-01", "002010",
+		"rv64i_m/F/FNMSUB-S-DYN-RUP-01", "002010",
+		"rv64i_m/F/FNMSUB-S-RDN-01", "002010",
+		"rv64i_m/F/FNMSUB-S-RMM-01", "002010",
+		"rv64i_m/F/FNMSUB-S-RNE-01", "002010",
+		"rv64i_m/F/FNMSUB-S-RTZ-01", "002010",
+		"rv64i_m/F/FNMSUB-S-RUP-01", "002010",
+		"rv64i_m/F/FSGNJN-S-01", "002010",
+		"rv64i_m/F/FSGNJ-S-01", "002010",
+		"rv64i_m/F/FSGNJX-S-01", "002010",
+		"rv64i_m/F/FSQRT-S-DYN-RDN-01", "002010",
+		"rv64i_m/F/FSQRT-S-DYN-RMM-01", "002010",
+		"rv64i_m/F/FSQRT-S-DYN-RNE-01", "002010",
+		"rv64i_m/F/FSQRT-S-DYN-RTZ-01", "002010",
+		"rv64i_m/F/FSQRT-S-DYN-RUP-01", "002010",
+		"rv64i_m/F/FSQRT-S-RDN-01", "002010",
+		"rv64i_m/F/FSQRT-S-RMM-01", "002010",
+		"rv64i_m/F/FSQRT-S-RNE-01", "002010",
+		"rv64i_m/F/FSQRT-S-RTZ-01", "002010",
+		"rv64i_m/F/FSQRT-S-RUP-01", "002010",
+		"rv64i_m/F/FSUB-S-DYN-RDN-01", "002010",
+		"rv64i_m/F/FSUB-S-DYN-RMM-01", "002010",
+		"rv64i_m/F/FSUB-S-DYN-RNE-01", "002010",
+		"rv64i_m/F/FSUB-S-DYN-RTZ-01", "002010",
+		"rv64i_m/F/FSUB-S-DYN-RUP-01", "002010",
+		"rv64i_m/F/FSUB-S-RDN-01", "002010",
+		"rv64i_m/F/FSUB-S-RMM-01", "002010",
+		"rv64i_m/F/FSUB-S-RNE-01", "002010",
+		"rv64i_m/F/FSUB-S-RTZ-01", "002010",
+		"rv64i_m/F/FSUB-S-RUP-01", "002010",
+		"rv64i_m/F/FSW-01", "002010"
   };
 
   string imperas64d[] = '{
     `IMPERASTEST,
-    "rv64i_m/D/I-FSD-01", "2000",
-    "rv64i_m/D/I-FLD-01", "2420",
-    "rv64i_m/D/I-FMV-X-D-01", "2000",
-    "rv64i_m/D//I-FMV-D-X-01", "2000",
-    "rv64i_m/D/I-FDIV-D-01", "2000",
-    "rv64i_m/D/I-FNMADD-D-01", "2000",
-    "rv64i_m/D/I-FNMSUB-D-01", "2000",
-    "rv64i_m/D/I-FMSUB-D-01", "2000",
-    "rv64i_m/D/I-FMAX-D-01", "2000",
-    "rv64i_m/D/I-FMIN-D-01", "2000",
-    "rv64i_m/D/I-FLE-D-01", "2000",
-    "rv64i_m/D/I-FLT-D-01", "2000",
-    "rv64i_m/D/I-FEQ-D-01", "2000",
-    "rv64i_m/D/I-FADD-D-01", "2000",
-    "rv64i_m/D/I-FCLASS-D-01", "2000",
-    "rv64i_m/D/I-FMADD-D-01", "2000",
-    "rv64i_m/D/I-FMUL-D-01", "2000",
-    "rv64i_m/D/I-FSGNJ-D-01", "2000",
-    "rv64i_m/D/I-FSGNJN-D-01", "2000",
-    "rv64i_m/D/I-FSGNJX-D-01", "2000",
-    "rv64i_m/D/I-FSQRT-D-01", "2000",
-    "rv64i_m/D/I-FSUB-D-01", "2000",
-   "rv64i_m/D/I-FCVT-D-L-01", "2000",
-   "rv64i_m/D/I-FCVT-D-LU-01", "2000",
-    "rv64i_m/D/I-FCVT-D-S-01", "2000", 
-   "rv64i_m/D/I-FCVT-D-W-01", "2000",
-   "rv64i_m/D/I-FCVT-D-WU-01", "2000",
-    "rv64i_m/D/I-FCVT-L-D-01", "2000",
-    "rv64i_m/D/I-FCVT-LU-D-01", "2000",
-    "rv64i_m/D/I-FCVT-S-D-01", "2000", 
-    "rv64i_m/D/I-FCVT-W-D-01", "2000",
-    "rv64i_m/D/I-FCVT-WU-D-01", "2000"
+		"rv64i_m/D/FADD-D-DYN-RDN-01", "002010",
+		"rv64i_m/D/FADD-D-DYN-RMM-01", "002010",
+		"rv64i_m/D/FADD-D-DYN-RNE-01", "002010",
+		"rv64i_m/D/FADD-D-DYN-RTZ-01", "002010",
+		"rv64i_m/D/FADD-D-DYN-RUP-01", "002010",
+		"rv64i_m/D/FADD-D-RDN-01", "002010",
+		"rv64i_m/D/FADD-D-RMM-01", "002010",
+		"rv64i_m/D/FADD-D-RNE-01", "002010",
+		"rv64i_m/D/FADD-D-RTZ-01", "002010",
+		"rv64i_m/D/FADD-D-RUP-01", "002010",
+		"rv64i_m/D/FCLASS-D-01", "002010",
+		"rv64i_m/D/FCVT-D-L-DYN-RDN-01", "002010",
+		"rv64i_m/D/FCVT-D-L-DYN-RMM-01", "002010",
+		"rv64i_m/D/FCVT-D-L-DYN-RNE-01", "002010",
+		"rv64i_m/D/FCVT-D-L-DYN-RTZ-01", "002010",
+		"rv64i_m/D/FCVT-D-L-DYN-RUP-01", "002010",
+		"rv64i_m/D/FCVT-D-L-RDN-01", "002010",
+		"rv64i_m/D/FCVT-D-L-RMM-01", "002010",
+		"rv64i_m/D/FCVT-D-L-RNE-01", "002010",
+		"rv64i_m/D/FCVT-D-L-RTZ-01", "002010",
+		"rv64i_m/D/FCVT-D-L-RUP-01", "002010",
+		"rv64i_m/D/FCVT-D-LU-DYN-RDN-01", "002010",
+		"rv64i_m/D/FCVT-D-LU-DYN-RMM-01", "002010",
+		"rv64i_m/D/FCVT-D-LU-DYN-RNE-01", "002010",
+		"rv64i_m/D/FCVT-D-LU-DYN-RTZ-01", "002010",
+		"rv64i_m/D/FCVT-D-LU-DYN-RUP-01", "002010",
+		"rv64i_m/D/FCVT-D-LU-RDN-01", "002010",
+		"rv64i_m/D/FCVT-D-LU-RMM-01", "002010",
+		"rv64i_m/D/FCVT-D-LU-RNE-01", "002010",
+		"rv64i_m/D/FCVT-D-LU-RTZ-01", "002010",
+		"rv64i_m/D/FCVT-D-LU-RUP-01", "002010",
+		"rv64i_m/D/FCVT-D-S-01", "002010",
+		"rv64i_m/D/FCVT-D-W-01", "002010",
+		"rv64i_m/D/FCVT-D-WU-01", "002010",
+		"rv64i_m/D/FCVT-L-D-DYN-RDN-01", "002010",
+		"rv64i_m/D/FCVT-L-D-DYN-RMM-01", "002010",
+		"rv64i_m/D/FCVT-L-D-DYN-RNE-01", "002010",
+		"rv64i_m/D/FCVT-L-D-DYN-RTZ-01", "002010",
+		"rv64i_m/D/FCVT-L-D-DYN-RUP-01", "002010",
+		"rv64i_m/D/FCVT-L-D-RDN-01", "002010",
+		"rv64i_m/D/FCVT-L-D-RMM-01", "002010",
+		"rv64i_m/D/FCVT-L-D-RNE-01", "002010",
+		"rv64i_m/D/FCVT-L-D-RTZ-01", "002010",
+		"rv64i_m/D/FCVT-L-D-RUP-01", "002010",
+		"rv64i_m/D/FCVT-LU-D-DYN-RDN-01", "002010",
+		"rv64i_m/D/FCVT-LU-D-DYN-RMM-01", "002010",
+		"rv64i_m/D/FCVT-LU-D-DYN-RNE-01", "002010",
+		"rv64i_m/D/FCVT-LU-D-DYN-RTZ-01", "002010",
+		"rv64i_m/D/FCVT-LU-D-DYN-RUP-01", "002010",
+		"rv64i_m/D/FCVT-LU-D-RDN-01", "002010",
+		"rv64i_m/D/FCVT-LU-D-RMM-01", "002010",
+		"rv64i_m/D/FCVT-LU-D-RNE-01", "002010",
+		"rv64i_m/D/FCVT-LU-D-RTZ-01", "002010",
+		"rv64i_m/D/FCVT-LU-D-RUP-01", "002010",
+		"rv64i_m/D/FCVT-S-D-DYN-RDN-01", "002010",
+		"rv64i_m/D/FCVT-S-D-DYN-RMM-01", "002010",
+		"rv64i_m/D/FCVT-S-D-DYN-RNE-01", "002010",
+		"rv64i_m/D/FCVT-S-D-DYN-RTZ-01", "002010",
+		"rv64i_m/D/FCVT-S-D-DYN-RUP-01", "002010",
+		"rv64i_m/D/FCVT-S-D-RDN-01", "002010",
+		"rv64i_m/D/FCVT-S-D-RMM-01", "002010",
+		"rv64i_m/D/FCVT-S-D-RNE-01", "002010",
+		"rv64i_m/D/FCVT-S-D-RTZ-01", "002010",
+		"rv64i_m/D/FCVT-S-D-RUP-01", "002010",
+		"rv64i_m/D/FCVT-W-D-DYN-RDN-01", "002010",
+		"rv64i_m/D/FCVT-W-D-DYN-RMM-01", "002010",
+		"rv64i_m/D/FCVT-W-D-DYN-RNE-01", "002010",
+		"rv64i_m/D/FCVT-W-D-DYN-RTZ-01", "002010",
+		"rv64i_m/D/FCVT-W-D-DYN-RUP-01", "002010",
+		"rv64i_m/D/FCVT-W-D-RDN-01", "002010",
+		"rv64i_m/D/FCVT-W-D-RMM-01", "002010",
+		"rv64i_m/D/FCVT-W-D-RNE-01", "002010",
+		"rv64i_m/D/FCVT-W-D-RTZ-01", "002010",
+		"rv64i_m/D/FCVT-W-D-RUP-01", "002010",
+		"rv64i_m/D/FCVT-WU-D-DYN-RDN-01", "002010",
+		"rv64i_m/D/FCVT-WU-D-DYN-RMM-01", "002010",
+		"rv64i_m/D/FCVT-WU-D-DYN-RNE-01", "002010",
+		"rv64i_m/D/FCVT-WU-D-DYN-RTZ-01", "002010",
+		"rv64i_m/D/FCVT-WU-D-DYN-RUP-01", "002010",
+		"rv64i_m/D/FCVT-WU-D-RDN-01", "002010",
+		"rv64i_m/D/FCVT-WU-D-RMM-01", "002010",
+		"rv64i_m/D/FCVT-WU-D-RNE-01", "002010",
+		"rv64i_m/D/FCVT-WU-D-RTZ-01", "002010",
+		"rv64i_m/D/FCVT-WU-D-RUP-01", "002010",
+		"rv64i_m/D/FDIV-D-DYN-RDN-01", "002010",
+		"rv64i_m/D/FDIV-D-DYN-RMM-01", "002010",
+		"rv64i_m/D/FDIV-D-DYN-RNE-01", "002010",
+		"rv64i_m/D/FDIV-D-DYN-RTZ-01", "002010",
+		"rv64i_m/D/FDIV-D-DYN-RUP-01", "002010",
+		"rv64i_m/D/FDIV-D-RDN-01", "002010",
+		"rv64i_m/D/FDIV-D-RMM-01", "002010",
+		"rv64i_m/D/FDIV-D-RNE-01", "002010",
+		"rv64i_m/D/FDIV-D-RTZ-01", "002010",
+		"rv64i_m/D/FDIV-D-RUP-01", "002010",
+		"rv64i_m/D/FEQ-D-01", "002010",
+		"rv64i_m/D/FLD-01", "002520",
+		"rv64i_m/D/FLE-D-01", "002010",
+		"rv64i_m/D/FLT-D-01", "002010",
+		"rv64i_m/D/FMADD-D-DYN-RDN-01", "003010",
+		"rv64i_m/D/FMADD-D-DYN-RMM-01", "003010",
+		"rv64i_m/D/FMADD-D-DYN-RNE-01", "003010",
+		"rv64i_m/D/FMADD-D-DYN-RTZ-01", "003010",
+		"rv64i_m/D/FMADD-D-DYN-RUP-01", "003010",
+		"rv64i_m/D/FMADD-D-RDN-01", "003010",
+		"rv64i_m/D/FMADD-D-RMM-01", "003010",
+		"rv64i_m/D/FMADD-D-RNE-01", "003010",
+		"rv64i_m/D/FMADD-D-RTZ-01", "003010",
+		"rv64i_m/D/FMADD-D-RUP-01", "003010",
+		"rv64i_m/D/FMAX-D-01", "002010",
+		"rv64i_m/D/FMIN-D-01", "002010",
+		"rv64i_m/D/FMSUB-D-DYN-RDN-01", "003010",
+		"rv64i_m/D/FMSUB-D-DYN-RMM-01", "003010",
+		"rv64i_m/D/FMSUB-D-DYN-RNE-01", "003010",
+		"rv64i_m/D/FMSUB-D-DYN-RTZ-01", "003010",
+		"rv64i_m/D/FMSUB-D-DYN-RUP-01", "003010",
+		"rv64i_m/D/FMSUB-D-RDN-01", "003010",
+		"rv64i_m/D/FMSUB-D-RMM-01", "003010",
+		"rv64i_m/D/FMSUB-D-RNE-01", "003010",
+		"rv64i_m/D/FMSUB-D-RTZ-01", "003010",
+		"rv64i_m/D/FMSUB-D-RUP-01", "003010",
+		"rv64i_m/D/FMUL-D-DYN-RDN-01", "002010",
+		"rv64i_m/D/FMUL-D-DYN-RMM-01", "002010",
+		"rv64i_m/D/FMUL-D-DYN-RNE-01", "002010",
+		"rv64i_m/D/FMUL-D-DYN-RTZ-01", "002010",
+		"rv64i_m/D/FMUL-D-DYN-RUP-01", "002010",
+		"rv64i_m/D/FMUL-D-RDN-01", "002010",
+		"rv64i_m/D/FMUL-D-RMM-01", "002010",
+		"rv64i_m/D/FMUL-D-RNE-01", "002010",
+		"rv64i_m/D/FMUL-D-RTZ-01", "002010",
+		"rv64i_m/D/FMUL-D-RUP-01", "002010",
+		"rv64i_m/D/FMV-D-X-01", "002010",
+		"rv64i_m/D/FMV-X-D-01", "002010",
+		"rv64i_m/D/FNMADD-D-DYN-RDN-01", "003010",
+		"rv64i_m/D/FNMADD-D-DYN-RMM-01", "003010",
+		"rv64i_m/D/FNMADD-D-DYN-RNE-01", "003010",
+		"rv64i_m/D/FNMADD-D-DYN-RTZ-01", "003010",
+		"rv64i_m/D/FNMADD-D-DYN-RUP-01", "003010",
+		"rv64i_m/D/FNMADD-D-RDN-01", "003010",
+		"rv64i_m/D/FNMADD-D-RMM-01", "003010",
+		"rv64i_m/D/FNMADD-D-RNE-01", "003010",
+		"rv64i_m/D/FNMADD-D-RTZ-01", "003010",
+		"rv64i_m/D/FNMADD-D-RUP-01", "003010",
+		"rv64i_m/D/FNMSUB-D-DYN-RDN-01", "003010",
+		"rv64i_m/D/FNMSUB-D-DYN-RMM-01", "003010",
+		"rv64i_m/D/FNMSUB-D-DYN-RNE-01", "003010",
+		"rv64i_m/D/FNMSUB-D-DYN-RTZ-01", "003010",
+		"rv64i_m/D/FNMSUB-D-DYN-RUP-01", "003010",
+		"rv64i_m/D/FNMSUB-D-RDN-01", "003010",
+		"rv64i_m/D/FNMSUB-D-RMM-01", "003010",
+		"rv64i_m/D/FNMSUB-D-RNE-01", "003010",
+		"rv64i_m/D/FNMSUB-D-RTZ-01", "003010",
+		"rv64i_m/D/FNMSUB-D-RUP-01", "003010",
+		"rv64i_m/D/FSD-01", "002010",
+		"rv64i_m/D/FSGNJ-D-01", "002010",
+		"rv64i_m/D/FSGNJN-D-01", "002010",
+		"rv64i_m/D/FSGNJX-D-01", "002010",
+		"rv64i_m/D/FSQRT-D-DYN-RDN-01", "002010",
+		"rv64i_m/D/FSQRT-D-DYN-RMM-01", "002010",
+		"rv64i_m/D/FSQRT-D-DYN-RNE-01", "002010",
+		"rv64i_m/D/FSQRT-D-DYN-RTZ-01", "002010",
+		"rv64i_m/D/FSQRT-D-DYN-RUP-01", "002010",
+		"rv64i_m/D/FSQRT-D-RDN-01", "002010",
+		"rv64i_m/D/FSQRT-D-RMM-01", "002010",
+		"rv64i_m/D/FSQRT-D-RNE-01", "002010",
+		"rv64i_m/D/FSQRT-D-RTZ-01", "002010",
+		"rv64i_m/D/FSQRT-D-RUP-01", "002010",
+		"rv64i_m/D/FSUB-D-DYN-RDN-01", "002010",
+		"rv64i_m/D/FSUB-D-DYN-RMM-01", "002010",
+		"rv64i_m/D/FSUB-D-DYN-RNE-01", "002010",
+		"rv64i_m/D/FSUB-D-DYN-RTZ-01", "002010",
+		"rv64i_m/D/FSUB-D-DYN-RUP-01", "002010",
+		"rv64i_m/D/FSUB-D-RDN-01", "002010",
+		"rv64i_m/D/FSUB-D-RMM-01", "002010",
+		"rv64i_m/D/FSUB-D-RNE-01", "002010",
+		"rv64i_m/D/FSUB-D-RTZ-01", "002010",
+		"rv64i_m/D/FSUB-D-RUP-01", "002010"
 };
 
-  string imperas64a[] = '{
-    `IMPERASTEST,
-    "rv64a/WALLY-AMO", "2110",
-    "rv64a/WALLY-LRSC", "2110"
-  };
-
   string imperas64m[] = '{
     `IMPERASTEST,
-    "rv64i_m/M/I-REMUW-01", "3000",
-    "rv64i_m/M/I-REMW-01", "3000",
-    "rv64i_m/M/I-DIVUW-01", "3000",
-    "rv64i_m/M/I-DIVW-01", "3000",
-    "rv64i_m/M/I-MUL-01", "3000",
-    "rv64i_m/M/I-MULH-01", "3000",
-    "rv64i_m/M/I-MULHSU-01", "3000",
-    "rv64i_m/M/I-MULHU-01", "3000",
-    "rv64i_m/M/I-MULW-01", "3000",
-    "rv64i_m/M/I-DIV-01", "3000",
-    "rv64i_m/M/I-DIVU-01", "3000",
-    "rv64i_m/M/I-REM-01", "3000",
-    "rv64i_m/M/I-REMU-01", "3000"
+		"rv64i_m/M/DIV-01", "004010",
+		"rv64i_m/M/DIVU-01", "004010",
+		"rv64i_m/M/DIVUW-01", "003010",
+		"rv64i_m/M/DIVW-01", "003010",
+		"rv64i_m/M/MUL-01", "004010",
+		"rv64i_m/M/MULH-01", "004010",
+		"rv64i_m/M/MULHSU-01", "004010",
+		"rv64i_m/M/MULHU-01", "004010",
+		"rv64i_m/M/MULW-01", "003010",
+		"rv64i_m/M/REM-01", "004010",
+		"rv64i_m/M/REMU-01", "004010",
+		"rv64i_m/M/REMUW-01", "003010",
+		"rv64i_m/M/REMW-01", "003010"
   };
 
   string imperas64c[] = '{
     `IMPERASTEST,
-    "rv64i_m/C/I-C-ADD-01", "3000",
-    "rv64i_m/C/I-C-ADDI-01", "3000",
-    "rv64i_m/C/I-C-ADDIW-01", "3000",
-    "rv64i_m/C/I-C-ADDW-01", "3000",
-    "rv64i_m/C/I-C-AND-01", "3000",
-    "rv64i_m/C/I-C-ANDI-01", "3000",
-    "rv64i_m/C/I-C-BEQZ-01", "3000",
-    "rv64i_m/C/I-C-BNEZ-01", "3000",
-    "rv64i_m/C/I-C-EBREAK-01", "2000",
-    "rv64i_m/C/I-C-J-01", "3000",
-    "rv64i_m/C/I-C-JALR-01", "4000",
-    "rv64i_m/C/I-C-JR-01", "4000",
-    "rv64i_m/C/I-C-LD-01", "3420",
-    "rv64i_m/C/I-C-LDSP-01", "3420",
-    "rv64i_m/C/I-C-LI-01", "3000",
-    "rv64i_m/C/I-C-LUI-01", "2000",
-    "rv64i_m/C/I-C-LW-01", "3110",
-    "rv64i_m/C/I-C-LWSP-01", "3110",
-    "rv64i_m/C/I-C-MV-01", "3000",
-    "rv64i_m/C/I-C-NOP-01", "2000",
-    "rv64i_m/C/I-C-OR-01", "3000",
-    "rv64i_m/C/I-C-SD-01", "3000",
-    "rv64i_m/C/I-C-SDSP-01", "3000",
-    "rv64i_m/C/I-C-SLLI-01", "3000",
-    "rv64i_m/C/I-C-SRAI-01", "3000",
-    "rv64i_m/C/I-C-SRLI-01", "3000",
-    "rv64i_m/C/I-C-SUB-01", "3000",
-    "rv64i_m/C/I-C-SUBW-01", "3000",
-    "rv64i_m/C/I-C-SW-01", "3000",
-    "rv64i_m/C/I-C-SWSP-01", "3000",
-    "rv64i_m/C/I-C-XOR-01", "3000"
+		"rv64i_m/C/C-ADD-01", "003010",
+		"rv64i_m/C/C-ADDI-01", "003010",
+		"rv64i_m/C/C-ADDI16SP-01", "003010",
+		"rv64i_m/C/C-ADDI4SPN-01", "003010",
+		"rv64i_m/C/C-ADDIW-01", "003010",
+		"rv64i_m/C/C-ADDW-01", "003010",
+		"rv64i_m/C/C-AND-01", "003010",
+		"rv64i_m/C/C-ANDI-01", "003010",
+		"rv64i_m/C/C-BEQZ-01", "004010",
+		"rv64i_m/C/C-BNEZ-01", "004010",
+		"rv64i_m/C/C-J-01", "003010",
+		"rv64i_m/C/C-JALR-01", "004010",
+		"rv64i_m/C/C-JR-01", "004010",
+		"rv64i_m/C/C-LD-01", "003520",
+		"rv64i_m/C/C-LDSP-01", "003520",
+		"rv64i_m/C/C-LI-01", "003010",
+		"rv64i_m/C/C-LUI-01", "002010",
+		"rv64i_m/C/C-LW-01", "003210",
+		"rv64i_m/C/C-LWSP-01", "003210",
+		"rv64i_m/C/C-MV-01", "003010",
+		"rv64i_m/C/C-OR-01", "003010",
+		"rv64i_m/C/C-SD-01", "003010",
+		"rv64i_m/C/C-SDSP-01", "003010",
+		"rv64i_m/C/C-SLLI-01", "003010",
+		"rv64i_m/C/C-SRAI-01", "003010",
+		"rv64i_m/C/C-SRLI-01", "003010",
+		"rv64i_m/C/C-SUB-01", "003010",
+		"rv64i_m/C/C-SUBW-01", "003010",
+		"rv64i_m/C/C-SW-01", "003010",
+		"rv64i_m/C/C-SWSP-01", "003010",
+		"rv64i_m/C/C-XOR-01", "003010",
+		"rv64i_m/C/I-C-EBREAK-01", "002000",
+		"rv64i_m/C/I-C-NOP-01", "002000"
   };
 
   string imperas64iNOc[] = {
     `IMPERASTEST,
-    "rv64i_m/I/I-MISALIGN_JMP-01","2000"
+		"rv64i_m/I/I-MISALIGN_JMP-01", "002000"
   };
 
   string imperas64i[] = '{
@@ -234,7 +697,7 @@ string imperas32f[] = '{
 		"rv64i_m/I/I-ECALL-01", "002010",
 		"rv64i_m/I/I-ENDIANESS-01", "002010",
 		"rv64i_m/I/I-IO-01", "002050",
-		"rv64i_m/I/I-MISALIGN_JMP-01", "002000",
+//		"rv64i_m/I/I-MISALIGN_JMP-01", "002000",
 		"rv64i_m/I/I-MISALIGN_LDST-01", "002010",
 		"rv64i_m/I/I-NOP-01", "002000",
 		"rv64i_m/I/I-RF_size-01", "002000",
@@ -276,280 +739,106 @@ string imperas32f[] = '{
 		"rv64i_m/I/SW-01", "004010",
 		"rv64i_m/I/XOR-01", "004010",
 		"rv64i_m/I/XORI-01", "003010"
-    /*
-    "rv64i_m/I/I-ADD-01", "3000",
-    "rv64i_m/I/I-ADDI-01", "3000",
-    "rv64i_m/I/I-ADDIW-01", "3000",
-    "rv64i_m/I/I-ADDW-01", "3000",
-    "rv64i_m/I/I-AND-01", "3000",
-    "rv64i_m/I/I-ANDI-01", "3000",
-    "rv64i_m/I/I-AUIPC-01", "3000",
-    "rv64i_m/I/I-BEQ-01", "4000",
-    "rv64i_m/I/I-BGE-01", "4000",
-    "rv64i_m/I/I-BGEU-01", "4000",
-    "rv64i_m/I/I-BLT-01", "4000",
-    "rv64i_m/I/I-BLTU-01", "4000",
-    "rv64i_m/I/I-BNE-01", "4000",
-    "rv64i_m/I/I-DELAY_SLOTS-01", "2000",
-    "rv64i_m/I/I-EBREAK-01", "2000",
-    "rv64i_m/I/I-ECALL-01", "2000",
-    "rv64i_m/I/I-ENDIANESS-01", "2010",
-    "rv64i_m/I/I-IO-01", "2050",
-    "rv64i_m/I/I-JAL-01", "3000",
-    "rv64i_m/I/I-JALR-01", "4000",
-    "rv64i_m/I/I-LB-01", "4020",
-    "rv64i_m/I/I-LBU-01", "4020",
-    "rv64i_m/I/I-LD-01", "4420",
-    "rv64i_m/I/I-LH-01", "4050",
-    "rv64i_m/I/I-LHU-01", "4050",
-    "rv64i_m/I/I-LUI-01", "2000",
-    "rv64i_m/I/I-LW-01", "4110",
-    "rv64i_m/I/I-LWU-01", "4110", 
-    "rv64i_m/I/I-MISALIGN_LDST-01", "2010",
-    "rv64i_m/I/I-NOP-01", "2000",
-    "rv64i_m/I/I-OR-01", "3000",
-    "rv64i_m/I/I-ORI-01", "3000",
-    "rv64i_m/I/I-RF_size-01", "2000",
-    "rv64i_m/I/I-RF_width-01", "2000",
-    "rv64i_m/I/I-RF_x0-01", "2010",
-    "rv64i_m/I/I-SB-01", "4000",
-    "rv64i_m/I/I-SD-01", "4000",
-    "rv64i_m/I/I-SH-01", "4000",
-    "rv64i_m/I/I-SLL-01", "3000",
-    "rv64i_m/I/I-SLLI-01", "3000",
-    "rv64i_m/I/I-SLLIW-01", "3000",
-    "rv64i_m/I/I-SLLW-01", "3000",
-    "rv64i_m/I/I-SLT-01", "3000",
-    "rv64i_m/I/I-SLTI-01", "3000",
-    "rv64i_m/I/I-SLTIU-01", "3000",
-    "rv64i_m/I/I-SLTU-01", "3000",
-    "rv64i_m/I/I-SRA-01", "3000",
-    "rv64i_m/I/I-SRAI-01", "3000",
-    "rv64i_m/I/I-SRAIW-01", "3000",
-    "rv64i_m/I/I-SRAW-01", "3000",
-    "rv64i_m/I/I-SRL-01", "3000",
-    "rv64i_m/I/I-SRLI-01", "3000",
-    "rv64i_m/I/I-SRLIW-01", "3000",
-    "rv64i_m/I/I-SRLW-01", "3000",
-    "rv64i_m/I/I-SUB-01", "3000",
-    "rv64i_m/I/I-SUBW-01", "3000",
-    "rv64i_m/I/I-SW-01", "4000",
-    "rv64i_m/I/I-XOR-01", "3000",
-    "rv64i_m/I/I-XORI-01", "3000",
-    "rv64i_m/I/WALLY-ADD", "4000",
-    "rv64i_m/I/WALLY-SUB", "4000",
-    "rv64i_m/I/WALLY-ADDI", "3000",
-    "rv64i_m/I/WALLY-ANDI", "3000",
-    "rv64i_m/I/WALLY-ORI", "3000",
-    "rv64i_m/I/WALLY-XORI", "3000",
-    "rv64i_m/I/WALLY-SLTI", "3000",
-    "rv64i_m/I/WALLY-SLTIU", "3000",
-    "rv64i_m/I/WALLY-SLLI", "3000",
-    "rv64i_m/I/WALLY-SRLI", "3000",
-    "rv64i_m/I/WALLY-SRAI", "3000",
-    "rv64i_m/I/WALLY-JAL", "4000",
-    "rv64i_m/I/WALLY-JALR", "3000",
-    "rv64i_m/I/WALLY-STORE", "3000",
-    "rv64i_m/I/WALLY-ADDIW", "3000",
-    "rv64i_m/I/WALLY-SLLIW", "3000",
-    "rv64i_m/I/WALLY-SRLIW", "3000",
-    "rv64i_m/I/WALLY-SRAIW", "3000",
-    "rv64i_m/I/WALLY-ADDW", "4000",
-    "rv64i_m/I/WALLY-SUBW", "4000",
-    "rv64i_m/I/WALLY-SLLW", "3000",
-    "rv64i_m/I/WALLY-SRLW", "3000",
-    "rv64i_m/I/WALLY-SRAW", "3000",
-    "rv64i_m/I/WALLY-BEQ" ,"5000",
-    "rv64i_m/I/WALLY-BNE", "5000 ",
-    "rv64i_m/I/WALLY-BLTU", "5000 ",
-    "rv64i_m/I/WALLY-BLT", "5000",
-    "rv64i_m/I/WALLY-BGE", "5000 ",
-    "rv64i_m/I/WALLY-BGEU", "5000 ",
-    "rv64i_m/I/WALLY-CSRRW", "4000",
-    "rv64i_m/I/WALLY-CSRRS", "4000",
-    "rv64i_m/I/WALLY-CSRRC", "5000",
-    "rv64i_m/I/WALLY-CSRRWI", "4000",
-    "rv64i_m/I/WALLY-CSRRSI", "4000",
-    "rv64i_m/I/WALLY-CSRRCI", "4000" */
-  };
-
-  string imperas32a[] = '{
-    `IMPERASTEST,
-    "rv32a/WALLY-AMO", "2110",
-    "rv32a/WALLY-LRSC", "2110"
   };
 
   string imperas32m[] = '{
     `IMPERASTEST,
-    "rv32i_m/M/I-DIVU-01", "2000",
-    "rv32i_m/M/I-REMU-01", "2000",
-    "rv32i_m/M/I-DIV-01", "2000",
-    "rv32i_m/M/I-REM-01", "2000",
-    "rv32i_m/M/I-MUL-01", "2000",
-    "rv32i_m/M/I-MULH-01", "2000",
-    "rv32i_m/M/I-MULHSU-01", "2000",
-    "rv32i_m/M/I-MULHU-01", "2000"
+		"rv32i_m/M/DIV-01", "002010",
+		"rv32i_m/M/DIVU-01", "002010",
+		"rv32i_m/M/MUL-01", "002010",
+		"rv32i_m/M/MULH-01", "002010",
+		"rv32i_m/M/MULHSU-01", "002010",
+		"rv32i_m/M/MULHU-01", "002010",
+		"rv32i_m/M/REM-01", "002010",
+		"rv32i_m/M/REMU-01", "002010"
   };
 
   string imperas32c[] = '{
     `IMPERASTEST,
-    "rv32i_m/C/I-C-ADD-01", "2000",
-    "rv32i_m/C/I-C-ADDI-01", "2000",
-    "rv32i_m/C/I-C-AND-01", "2000",
-    "rv32i_m/C/I-C-ANDI-01", "2000",
-    "rv32i_m/C/I-C-BEQZ-01", "2000",
-    "rv32i_m/C/I-C-BNEZ-01", "2000",
-    "rv32i_m/C/I-C-EBREAK-01", "2000",
-    "rv32i_m/C/I-C-J-01", "2000",
-    "rv32i_m/C/I-C-JALR-01", "3000",
-    "rv32i_m/C/I-C-JR-01", "3000",
-    "rv32i_m/C/I-C-LI-01", "2000",
-    "rv32i_m/C/I-C-LUI-01", "2000",
-    "rv32i_m/C/I-C-LW-01", "2110",
-    "rv32i_m/C/I-C-LWSP-01", "2110",
-    "rv32i_m/C/I-C-MV-01", "2000",
-    "rv32i_m/C/I-C-NOP-01", "2000",
-    "rv32i_m/C/I-C-OR-01", "2000",
-    "rv32i_m/C/I-C-SLLI-01", "2000",
-    "rv32i_m/C/I-C-SRAI-01", "2000",
-    "rv32i_m/C/I-C-SRLI-01", "2000",
-    "rv32i_m/C/I-C-SUB-01", "2000",
-    "rv32i_m/C/I-C-SW-01", "2000",
-    "rv32i_m/C/I-C-SWSP-01", "2000",
-    "rv32i_m/C/I-C-XOR-01", "2000"
+		"rv32i_m/C/C-ADD-01", "002010",
+		"rv32i_m/C/C-ADDI-01", "002010",
+		"rv32i_m/C/C-ADDI16SP-01", "002010",
+		"rv32i_m/C/C-ADDI4SPN-01", "002010",
+		"rv32i_m/C/C-AND-01", "002010",
+		"rv32i_m/C/C-ANDI-01", "002010",
+		"rv32i_m/C/C-BEQZ-01", "003010",
+		"rv32i_m/C/C-BNEZ-01", "003010",
+		"rv32i_m/C/C-J-01", "002010",
+		"rv32i_m/C/C-JAL-01", "002010",
+		"rv32i_m/C/C-JALR-01", "003010",
+		"rv32i_m/C/C-JR-01", "003010",
+		"rv32i_m/C/C-LI-01", "002010",
+		"rv32i_m/C/C-LUI-01", "002010",
+		"rv32i_m/C/C-LW-01", "002120",
+		"rv32i_m/C/C-LWSP-01", "002120",
+		"rv32i_m/C/C-MV-01", "002010",
+		"rv32i_m/C/C-OR-01", "002010",
+		"rv32i_m/C/C-SLLI-01", "002010",
+		"rv32i_m/C/C-SRAI-01", "002010",
+		"rv32i_m/C/C-SRLI-01", "002010",
+		"rv32i_m/C/C-SUB-01", "002010",
+		"rv32i_m/C/C-SW-01", "002010",
+		"rv32i_m/C/C-SWSP-01", "002010",
+		"rv32i_m/C/C-XOR-01", "002010",
+		"rv32i_m/C/I-C-EBREAK-01", "002000",
+		"rv32i_m/C/I-C-NOP-01", "002000"
   };
 
   string imperas32iNOc[] = {
     `IMPERASTEST,
-    "rv32i_m/I/I-MISALIGN_JMP-01","2000"
+		"rv32i_m/I/I-MISALIGN_JMP-01", "002000"
   };
 
   string imperas32i[] = {
     `IMPERASTEST,
-	"rv32i_m/I/ADD-01", "002010",
-	"rv32i_m/I/ADDI-01", "002010",
-	"rv32i_m/I/AND-01", "002010",
-	"rv32i_m/I/ANDI-01", "002010",
-	"rv32i_m/I/AUIPC-01", "002010",
-	"rv32i_m/I/BEQ-01", "003010",
-	"rv32i_m/I/BGE-01", "003010",
-	"rv32i_m/I/BGEU-01", "003010",
-	"rv32i_m/I/BLT-01", "003010",
-	"rv32i_m/I/BLTU-01", "003010",
-	"rv32i_m/I/BNE-01", "003010",
-	"rv32i_m/I/I-DELAY_SLOTS-01", "002010",
-	"rv32i_m/I/I-EBREAK-01", "002010",
-	"rv32i_m/I/I-ECALL-01", "002010",
-	"rv32i_m/I/I-ENDIANESS-01", "002010",
-	"rv32i_m/I/I-IO-01", "002030",
-	"rv32i_m/I/I-MISALIGN_JMP-01", "002000",
-	"rv32i_m/I/I-MISALIGN_LDST-01", "002010",
-	"rv32i_m/I/I-NOP-01", "002000",
-	"rv32i_m/I/I-RF_size-01", "002000",
-	"rv32i_m/I/I-RF_width-01", "002000",
-	"rv32i_m/I/I-RF_x0-01", "002010",
-	"rv32i_m/I/JAL-01", "003010",
-	"rv32i_m/I/JALR-01", "003010",
-	"rv32i_m/I/LB-01", "003030",
-	"rv32i_m/I/LBU-01", "003030",
-	"rv32i_m/I/LH-01", "003060",
-	"rv32i_m/I/LHU-01", "003060",
-	"rv32i_m/I/LUI-01", "002010",
-	"rv32i_m/I/LW-01", "003120",
-	"rv32i_m/I/OR-01", "002010",
-	"rv32i_m/I/ORI-01", "002010",
-	"rv32i_m/I/SB-01", "003010",
-	"rv32i_m/I/SH-01", "003010",
-	"rv32i_m/I/SLL-01", "002010",
-	"rv32i_m/I/SLLI-01", "002010",
-	"rv32i_m/I/SLT-01", "002010",
-	"rv32i_m/I/SLTI-01", "002010",
-	"rv32i_m/I/SLTIU-01", "002010",
-	"rv32i_m/I/SLTU-01", "002010",
-	"rv32i_m/I/SRA-01", "002010",
-	"rv32i_m/I/SRAI-01", "002010",
-	"rv32i_m/I/SRL-01", "002010",
-	"rv32i_m/I/SRLI-01", "002010",
-	"rv32i_m/I/SUB-01", "002010",
-	"rv32i_m/I/SW-01", "003010",
-	"rv32i_m/I/XOR-01", "002010",
-	"rv32i_m/I/XORI-01", "002010"    
-/*    //"rv32i_m/I/WALLY-PIPELINE-100K", "10a800",
-    "rv32i_m/I/I-ADD-01", "2000",
-    "rv32i_m/I/I-ADDI-01","2000",
-    "rv32i_m/I/I-AND-01","2000",
-    "rv32i_m/I/I-ANDI-01","2000",
-    "rv32i_m/I/I-AUIPC-01","2000",
-    "rv32i_m/I/I-BEQ-01","3000",
-    "rv32i_m/I/I-BGE-01","3000",
-    "rv32i_m/I/I-BGEU-01","3000",
-    "rv32i_m/I/I-BLT-01","3000",
-    "rv32i_m/I/I-BLTU-01","3000",
-    "rv32i_m/I/I-BNE-01","3000",
-    "rv32i_m/I/I-DELAY_SLOTS-01","2000",
-    "rv32i_m/I/I-EBREAK-01","2000",
-    "rv32i_m/I/I-ECALL-01","2000",
-    "rv32i_m/I/I-ENDIANESS-01","2010",
-    "rv32i_m/I/I-IO-01","2030rv",
-    "rv32i_m/I/I-JAL-01","3000",
-    "rv32i_m/I/I-JALR-01","3000",
-    "rv32i_m/I/I-LB-01","3020",
-    "rv32i_m/I/I-LBU-01","3020",
-    "rv32i_m/I/I-LH-01","3050",
-    "rv32i_m/I/I-LHU-01","3050",
-    "rv32i_m/I/I-LUI-01","2000",
-    "rv32i_m/I/I-LW-01","3110",
-    "rv32i_m/I/I-MISALIGN_LDST-01","2010",
-    "rv32i_m/I/I-NOP-01","2000",
-    "rv32i_m/I/I-OR-01","2000",
-    "rv32i_m/I/I-ORI-01","2000",
-    "rv32i_m/I/I-RF_size-01","2000",
-    "rv32i_m/I/I-RF_width-01","2000",
-    "rv32i_m/I/I-RF_x0-01","2010",
-    "rv32i_m/I/I-SB-01","3000",
-    "rv32i_m/I/I-SH-01","3000",
-    "rv32i_m/I/I-SLL-01","2000",
-    "rv32i_m/I/I-SLLI-01","2000",
-    "rv32i_m/I/I-SLT-01","2000",
-    "rv32i_m/I/I-SLTI-01","2000",
-    "rv32i_m/I/I-SLTIU-01","2000",
-    "rv32i_m/I/I-SLTU-01","2000",
-    "rv32i_m/I/I-SRA-01","2000",
-    "rv32i_m/I/I-SRAI-01","2000",
-    "rv32i_m/I/I-SRL-01","2000",
-    "rv32i_m/I/I-SRLI-01","2000",
-    "rv32i_m/I/I-SUB-01","2000",
-    "rv32i_m/I/I-SW-01","3000",
-    "rv32i_m/I/I-XOR-01","2000",
-    "rv32i_m/I/I-XORI-01","2000",
-    "rv32i_m/I/WALLY-ADD", "3000",
-    "rv32i_m/I/WALLY-SUB", "3000",
-    "rv32i_m/I/WALLY-ADDI", "2000",
-    "rv32i_m/I/WALLY-ANDI", "2000",
-    "rv32i_m/I/WALLY-ORI", "2000",
-    "rv32i_m/I/WALLY-XORI", "2000",
-    "rv32i_m/I/WALLY-SLTI", "2000",
-    "rv32i_m/I/WALLY-SLTIU", "2000",
-    "rv32i_m/I/WALLY-SLLI", "2000",
-    "rv32i_m/I/WALLY-SRLI", "2000",
-    "rv32i_m/I/WALLY-SRAI", "2000",
-    "rv32i_m/I/WALLY-LOAD", "11c00",
-    "rv32i_m/I/WALLY-SUB", "3000",
-    "rv32i_m/I/WALLY-STORE", "2000",
-    "rv32i_m/I/WALLY-JAL", "3000",
-    "rv32i_m/I/WALLY-JALR", "2000",
-    "rv32i_m/I/WALLY-BEQ" ,"4000",
-    "rv32i_m/I/WALLY-BNE", "4000 ",
-    "rv32i_m/I/WALLY-BLTU", "4000 ",
-    "rv32i_m/I/WALLY-BLT", "4000",
-    "rv32i_m/I/WALLY-BGE", "4000 ",
-    "rv32i_m/I/WALLY-BGEU", "4000 ",
-    "rv32i_m/I/WALLY-CSRRW", "3000",
-    "rv32i_m/I/WALLY-CSRRS", "3000",
-    "rv32i_m/I/WALLY-CSRRC", "4000",
-    "rv32i_m/I/WALLY-CSRRWI", "3000",
-    "rv32i_m/I/WALLY-CSRRSI", "3000",
-    "rv32i_m/I/WALLY-CSRRCI", "3000" */
+		"rv32i_m/I/ADD-01", "002010",
+		"rv32i_m/I/ADDI-01", "002010",
+		"rv32i_m/I/AND-01", "002010",
+		"rv32i_m/I/ANDI-01", "002010",
+		"rv32i_m/I/AUIPC-01", "002010",
+		"rv32i_m/I/BEQ-01", "003010",
+		"rv32i_m/I/BGE-01", "003010",
+		"rv32i_m/I/BGEU-01", "003010",
+		"rv32i_m/I/BLT-01", "003010",
+		"rv32i_m/I/BLTU-01", "003010",
+		"rv32i_m/I/BNE-01", "003010",
+		"rv32i_m/I/I-DELAY_SLOTS-01", "002010",
+		"rv32i_m/I/I-EBREAK-01", "002010",
+		"rv32i_m/I/I-ECALL-01", "002010",
+		"rv32i_m/I/I-ENDIANESS-01", "002010",
+		"rv32i_m/I/I-IO-01", "002030",
+//		"rv32i_m/I/I-MISALIGN_JMP-01", "002000",
+		"rv32i_m/I/I-MISALIGN_LDST-01", "002010",
+		"rv32i_m/I/I-NOP-01", "002000",
+		"rv32i_m/I/I-RF_size-01", "002000",
+		"rv32i_m/I/I-RF_width-01", "002000",
+		"rv32i_m/I/I-RF_x0-01", "002010",
+		"rv32i_m/I/JAL-01", "003010",
+		"rv32i_m/I/JALR-01", "003010",
+		"rv32i_m/I/LB-01", "003030",
+		"rv32i_m/I/LBU-01", "003030",
+		"rv32i_m/I/LH-01", "003060",
+		"rv32i_m/I/LHU-01", "003060",
+		"rv32i_m/I/LUI-01", "002010",
+		"rv32i_m/I/LW-01", "003120",
+		"rv32i_m/I/OR-01", "002010",
+		"rv32i_m/I/ORI-01", "002010",
+		"rv32i_m/I/SB-01", "003010",
+		"rv32i_m/I/SH-01", "003010",
+		"rv32i_m/I/SLL-01", "002010",
+		"rv32i_m/I/SLLI-01", "002010",
+		"rv32i_m/I/SLT-01", "002010",
+		"rv32i_m/I/SLTI-01", "002010",
+		"rv32i_m/I/SLTIU-01", "002010",
+		"rv32i_m/I/SLTU-01", "002010",
+		"rv32i_m/I/SRA-01", "002010",
+		"rv32i_m/I/SRAI-01", "002010",
+		"rv32i_m/I/SRL-01", "002010",
+		"rv32i_m/I/SRLI-01", "002010",
+		"rv32i_m/I/SUB-01", "002010",
+		"rv32i_m/I/SW-01", "003010",
+		"rv32i_m/I/XOR-01", "002010",
+		"rv32i_m/I/XORI-01", "002010"   
   };
 
   string testsBP64[] = '{
@@ -563,7 +852,7 @@ string imperas32f[] = '{
   };
 
   string imperas64p[] = '{
-    `IMPERASTEST,
+    `MYIMPERASTEST,
     "rv64p/WALLY-MSTATUS", "2000",
     "rv64p/WALLY-MCAUSE", "3000",
     "rv64p/WALLY-SCAUSE", "2000",
@@ -585,7 +874,7 @@ string imperas32f[] = '{
   };
 
   string imperas32p[] = '{
-    `IMPERASTEST,
+    `MYIMPERASTEST,
     "rv32p/WALLY-MSTATUS", "2000",
     "rv32p/WALLY-MCAUSE", "3000",
     "rv32p/WALLY-SCAUSE", "2000",
@@ -607,12 +896,12 @@ string imperas32f[] = '{
   };
 
   string imperas64periph[] = '{
-    `IMPERASTEST,
+    `MYIMPERASTEST,
     "rv64i-periph/WALLY-PERIPH", "2000"
   };
 
   string imperas32periph[] = '{
-    `IMPERASTEST,
+    `MYIMPERASTEST,
     "rv32i-periph/WALLY-PLIC", "2080"
   };