diff --git a/pipelined/testbench/tests.vh b/pipelined/testbench/tests.vh
index 9d4f78547..4154c6366 100644
--- a/pipelined/testbench/tests.vh
+++ b/pipelined/testbench/tests.vh
@@ -1054,33 +1054,33 @@ string imperas32f[] = '{
 
   string arch64d[] = '{
     `RISCVARCHTEST,
-    "rv64i_m/D/src/fadd.d_b10-01.S",
-    "rv64i_m/D/src/fadd.d_b1-01.S",
-    "rv64i_m/D/src/fadd.d_b11-01.S",
-    "rv64i_m/D/src/fadd.d_b12-01.S",
-    "rv64i_m/D/src/fadd.d_b13-01.S",
-    "rv64i_m/D/src/fadd.d_b2-01.S",
-    "rv64i_m/D/src/fadd.d_b3-01.S",
-    "rv64i_m/D/src/fadd.d_b4-01.S",
-    "rv64i_m/D/src/fadd.d_b5-01.S",
-    "rv64i_m/D/src/fadd.d_b7-01.S",
-    "rv64i_m/D/src/fadd.d_b8-01.S",
-    "rv64i_m/D/src/fclass.d_b1-01.S",
+    "rv32i_m/D/src/fadd.d_b10-01.S",
+    "rv32i_m/D/src/fadd.d_b1-01.S",
+    "rv32i_m/D/src/fadd.d_b11-01.S",
+    "rv32i_m/D/src/fadd.d_b12-01.S",
+    "rv32i_m/D/src/fadd.d_b13-01.S",
+    "rv32i_m/D/src/fadd.d_b2-01.S",
+    "rv32i_m/D/src/fadd.d_b3-01.S",
+    "rv32i_m/D/src/fadd.d_b4-01.S",
+    "rv32i_m/D/src/fadd.d_b5-01.S",
+    "rv32i_m/D/src/fadd.d_b7-01.S",
+    "rv32i_m/D/src/fadd.d_b8-01.S",
+    "rv32i_m/D/src/fclass.d_b1-01.S",
     "rv64i_m/D/src/fcvt.d.l_b25-01.S",
     "rv64i_m/D/src/fcvt.d.l_b26-01.S",
     "rv64i_m/D/src/fcvt.d.lu_b25-01.S",
     "rv64i_m/D/src/fcvt.d.lu_b26-01.S",
-    "rv64i_m/D/src/fcvt.d.s_b1-01.S",
-    "rv64i_m/D/src/fcvt.d.s_b22-01.S",
-    "rv64i_m/D/src/fcvt.d.s_b23-01.S",
-    "rv64i_m/D/src/fcvt.d.s_b24-01.S",
-    "rv64i_m/D/src/fcvt.d.s_b27-01.S",
-    "rv64i_m/D/src/fcvt.d.s_b28-01.S",
-    "rv64i_m/D/src/fcvt.d.s_b29-01.S",
-    "rv64i_m/D/src/fcvt.d.w_b25-01.S",
-    "rv64i_m/D/src/fcvt.d.w_b26-01.S",
-    "rv64i_m/D/src/fcvt.d.wu_b25-01.S",
-    "rv64i_m/D/src/fcvt.d.wu_b26-01.S",
+    "rv32i_m/D/src/fcvt.d.s_b1-01.S",
+    "rv32i_m/D/src/fcvt.d.s_b22-01.S",
+    "rv32i_m/D/src/fcvt.d.s_b23-01.S",
+    "rv32i_m/D/src/fcvt.d.s_b24-01.S",
+    "rv32i_m/D/src/fcvt.d.s_b27-01.S",
+    "rv32i_m/D/src/fcvt.d.s_b28-01.S",
+    "rv32i_m/D/src/fcvt.d.s_b29-01.S",
+    "rv32i_m/D/src/fcvt.d.w_b25-01.S",
+    "rv32i_m/D/src/fcvt.d.w_b26-01.S",
+    "rv32i_m/D/src/fcvt.d.wu_b25-01.S",
+    "rv32i_m/D/src/fcvt.d.wu_b26-01.S",
     "rv64i_m/D/src/fcvt.l.d_b1-01.S",
     "rv64i_m/D/src/fcvt.l.d_b22-01.S",
     "rv64i_m/D/src/fcvt.l.d_b23-01.S",
@@ -1095,135 +1095,135 @@ string imperas32f[] = '{
     "rv64i_m/D/src/fcvt.lu.d_b27-01.S",
     "rv64i_m/D/src/fcvt.lu.d_b28-01.S",
     "rv64i_m/D/src/fcvt.lu.d_b29-01.S",
-    "rv64i_m/D/src/fcvt.s.d_b1-01.S",
-    "rv64i_m/D/src/fcvt.s.d_b22-01.S",
-    "rv64i_m/D/src/fcvt.s.d_b23-01.S",
-    "rv64i_m/D/src/fcvt.s.d_b24-01.S",
-    "rv64i_m/D/src/fcvt.s.d_b27-01.S",
-    "rv64i_m/D/src/fcvt.s.d_b28-01.S",
-    "rv64i_m/D/src/fcvt.s.d_b29-01.S",
-    "rv64i_m/D/src/fcvt.w.d_b1-01.S",
-    "rv64i_m/D/src/fcvt.w.d_b22-01.S",
-    "rv64i_m/D/src/fcvt.w.d_b23-01.S",
-    "rv64i_m/D/src/fcvt.w.d_b24-01.S",
-    "rv64i_m/D/src/fcvt.w.d_b27-01.S",
-    "rv64i_m/D/src/fcvt.w.d_b28-01.S",
-    "rv64i_m/D/src/fcvt.w.d_b29-01.S",
-    "rv64i_m/D/src/fcvt.wu.d_b1-01.S",
-    "rv64i_m/D/src/fcvt.wu.d_b22-01.S",
-    "rv64i_m/D/src/fcvt.wu.d_b23-01.S",
-    "rv64i_m/D/src/fcvt.wu.d_b24-01.S",
-    "rv64i_m/D/src/fcvt.wu.d_b27-01.S",
-    "rv64i_m/D/src/fcvt.wu.d_b28-01.S",
-    "rv64i_m/D/src/fcvt.wu.d_b29-01.S",
-    "rv64i_m/D/src/fdiv.d_b1-01.S",
-    "rv64i_m/D/src/fdiv.d_b20-01.S",
-    "rv64i_m/D/src/fdiv.d_b2-01.S",
-    "rv64i_m/D/src/fdiv.d_b21-01.S",
-    "rv64i_m/D/src/fdiv.d_b3-01.S",
-    "rv64i_m/D/src/fdiv.d_b4-01.S",
-    "rv64i_m/D/src/fdiv.d_b5-01.S",
-    "rv64i_m/D/src/fdiv.d_b6-01.S",
-    "rv64i_m/D/src/fdiv.d_b7-01.S",
-    "rv64i_m/D/src/fdiv.d_b8-01.S",
-    "rv64i_m/D/src/fdiv.d_b9-01.S",
-    "rv64i_m/D/src/feq.d_b1-01.S",
-    "rv64i_m/D/src/feq.d_b19-01.S",
-    "rv64i_m/D/src/fle.d_b1-01.S",
-    "rv64i_m/D/src/fle.d_b19-01.S",
-    "rv64i_m/D/src/flt.d_b1-01.S",
-    "rv64i_m/D/src/flt.d_b19-01.S",
-    // "rv64i_m/D/src/fld-align-01.S", //missing right now from top of tree, should be returned when it comes back
-    // "rv64i_m/D/src/fsd-align-01.S", //https://github.com/riscv-non-isa/riscv-arch-test/issues/266
-    "rv64i_m/D/src/fmadd.d_b14-01.S",
-    "rv64i_m/D/src/fmadd.d_b16-01.S",
-    "rv64i_m/D/src/fmadd.d_b17-01.S",
-    "rv64i_m/D/src/fmadd.d_b18-01.S",
-    "rv64i_m/D/src/fmadd.d_b2-01.S",
-    "rv64i_m/D/src/fmadd.d_b3-01.S",
-    "rv64i_m/D/src/fmadd.d_b4-01.S",
-    "rv64i_m/D/src/fmadd.d_b5-01.S",
-    "rv64i_m/D/src/fmadd.d_b6-01.S",
-    "rv64i_m/D/src/fmadd.d_b7-01.S",
-    "rv64i_m/D/src/fmadd.d_b8-01.S",
-    "rv64i_m/D/src/fmax.d_b1-01.S",
-    "rv64i_m/D/src/fmax.d_b19-01.S",
-    "rv64i_m/D/src/fmin.d_b1-01.S",
-    "rv64i_m/D/src/fmin.d_b19-01.S",
-    "rv64i_m/D/src/fmsub.d_b14-01.S",
-    "rv64i_m/D/src/fmsub.d_b16-01.S",
-    "rv64i_m/D/src/fmsub.d_b17-01.S",
-    "rv64i_m/D/src/fmsub.d_b18-01.S",
-    "rv64i_m/D/src/fmsub.d_b2-01.S",
-    "rv64i_m/D/src/fmsub.d_b3-01.S",
-    "rv64i_m/D/src/fmsub.d_b4-01.S",
-    "rv64i_m/D/src/fmsub.d_b5-01.S",
-    "rv64i_m/D/src/fmsub.d_b6-01.S",
-    "rv64i_m/D/src/fmsub.d_b7-01.S",
-    "rv64i_m/D/src/fmsub.d_b8-01.S",
-    "rv64i_m/D/src/fmul.d_b1-01.S",
-    "rv64i_m/D/src/fmul.d_b2-01.S",
-    "rv64i_m/D/src/fmul.d_b3-01.S",
-    "rv64i_m/D/src/fmul.d_b4-01.S",
-    "rv64i_m/D/src/fmul.d_b5-01.S",
-    "rv64i_m/D/src/fmul.d_b6-01.S",
-    "rv64i_m/D/src/fmul.d_b7-01.S",
-    "rv64i_m/D/src/fmul.d_b8-01.S",
-    "rv64i_m/D/src/fmul.d_b9-01.S",
-    "rv64i_m/D/src/fmv.d.x_b25-01.S",
-    "rv64i_m/D/src/fmv.d.x_b26-01.S",
-    "rv64i_m/D/src/fmv.x.d_b1-01.S",
-    "rv64i_m/D/src/fmv.x.d_b22-01.S",
-    "rv64i_m/D/src/fmv.x.d_b23-01.S",
-    "rv64i_m/D/src/fmv.x.d_b24-01.S",
-    "rv64i_m/D/src/fmv.x.d_b27-01.S",
-    "rv64i_m/D/src/fmv.x.d_b28-01.S",
-    "rv64i_m/D/src/fmv.x.d_b29-01.S",
-    "rv64i_m/D/src/fnmadd.d_b14-01.S",
-    "rv64i_m/D/src/fnmadd.d_b16-01.S",
-    "rv64i_m/D/src/fnmadd.d_b17-01.S",
-    "rv64i_m/D/src/fnmadd.d_b18-01.S",
-    "rv64i_m/D/src/fnmadd.d_b2-01.S",
-    "rv64i_m/D/src/fnmadd.d_b3-01.S",
-    "rv64i_m/D/src/fnmadd.d_b4-01.S",
-    "rv64i_m/D/src/fnmadd.d_b5-01.S",
-    "rv64i_m/D/src/fnmadd.d_b6-01.S",
-    "rv64i_m/D/src/fnmadd.d_b7-01.S",
-    "rv64i_m/D/src/fnmadd.d_b8-01.S",
-    "rv64i_m/D/src/fnmsub.d_b14-01.S",
-    "rv64i_m/D/src/fnmsub.d_b16-01.S",
-    "rv64i_m/D/src/fnmsub.d_b17-01.S",
-    "rv64i_m/D/src/fnmsub.d_b18-01.S",
-    "rv64i_m/D/src/fnmsub.d_b2-01.S",
-    "rv64i_m/D/src/fnmsub.d_b3-01.S",
-    "rv64i_m/D/src/fnmsub.d_b4-01.S",
-    "rv64i_m/D/src/fnmsub.d_b5-01.S",
-    "rv64i_m/D/src/fnmsub.d_b6-01.S",
-    "rv64i_m/D/src/fnmsub.d_b7-01.S",
-    "rv64i_m/D/src/fnmsub.d_b8-01.S",
-    "rv64i_m/D/src/fsgnj.d_b1-01.S",
-    "rv64i_m/D/src/fsgnjn.d_b1-01.S",
-    "rv64i_m/D/src/fsgnjx.d_b1-01.S",
-    // "rv64i_m/D/src/fsqrt.d_b1-01.S",
-    // "rv64i_m/D/src/fsqrt.d_b20-01.S",
-    // "rv64i_m/D/src/fsqrt.d_b2-01.S",
-    // "rv64i_m/D/src/fsqrt.d_b3-01.S",
-    // "rv64i_m/D/src/fsqrt.d_b4-01.S",
-    // "rv64i_m/D/src/fsqrt.d_b5-01.S",
-    // "rv64i_m/D/src/fsqrt.d_b7-01.S",
-    // "rv64i_m/D/src/fsqrt.d_b8-01.S",
-    // "rv64i_m/D/src/fsqrt.d_b9-01.S",
-    "rv64i_m/D/src/fssub.d_b10-01.S",
-    "rv64i_m/D/src/fssub.d_b1-01.S",
-    "rv64i_m/D/src/fssub.d_b11-01.S",
-    "rv64i_m/D/src/fssub.d_b12-01.S",
-    "rv64i_m/D/src/fssub.d_b13-01.S",
-    "rv64i_m/D/src/fssub.d_b2-01.S",
-    "rv64i_m/D/src/fssub.d_b3-01.S",
-    "rv64i_m/D/src/fssub.d_b4-01.S",
-    "rv64i_m/D/src/fssub.d_b5-01.S",
-    "rv64i_m/D/src/fssub.d_b7-01.S",
-    "rv64i_m/D/src/fssub.d_b8-01.S"
+    "rv32i_m/D/src/fcvt.s.d_b1-01.S",
+    "rv32i_m/D/src/fcvt.s.d_b22-01.S",
+    "rv32i_m/D/src/fcvt.s.d_b23-01.S",
+    "rv32i_m/D/src/fcvt.s.d_b24-01.S",
+    "rv32i_m/D/src/fcvt.s.d_b27-01.S",
+    "rv32i_m/D/src/fcvt.s.d_b28-01.S",
+    "rv32i_m/D/src/fcvt.s.d_b29-01.S",
+    "rv32i_m/D/src/fcvt.w.d_b1-01.S",
+    "rv32i_m/D/src/fcvt.w.d_b22-01.S",
+    "rv32i_m/D/src/fcvt.w.d_b23-01.S",
+    "rv32i_m/D/src/fcvt.w.d_b24-01.S",
+    "rv32i_m/D/src/fcvt.w.d_b27-01.S",
+    "rv32i_m/D/src/fcvt.w.d_b28-01.S",
+    "rv32i_m/D/src/fcvt.w.d_b29-01.S",
+    "rv32i_m/D/src/fcvt.wu.d_b1-01.S",
+    "rv32i_m/D/src/fcvt.wu.d_b22-01.S",
+    "rv32i_m/D/src/fcvt.wu.d_b23-01.S",
+    "rv32i_m/D/src/fcvt.wu.d_b24-01.S",
+    "rv32i_m/D/src/fcvt.wu.d_b27-01.S",
+    "rv32i_m/D/src/fcvt.wu.d_b28-01.S",
+    "rv32i_m/D/src/fcvt.wu.d_b29-01.S",
+    "rv32i_m/D/src/fdiv.d_b1-01.S",
+    "rv32i_m/D/src/fdiv.d_b20-01.S",
+    "rv32i_m/D/src/fdiv.d_b2-01.S",
+    "rv32i_m/D/src/fdiv.d_b21-01.S",
+    "rv32i_m/D/src/fdiv.d_b3-01.S",
+    "rv32i_m/D/src/fdiv.d_b4-01.S",
+    "rv32i_m/D/src/fdiv.d_b5-01.S",
+    "rv32i_m/D/src/fdiv.d_b6-01.S",
+    "rv32i_m/D/src/fdiv.d_b7-01.S",
+    "rv32i_m/D/src/fdiv.d_b8-01.S",
+    "rv32i_m/D/src/fdiv.d_b9-01.S",
+    "rv32i_m/D/src/feq.d_b1-01.S",
+    "rv32i_m/D/src/feq.d_b19-01.S",
+    "rv32i_m/D/src/fle.d_b1-01.S",
+    "rv32i_m/D/src/fle.d_b19-01.S",
+    "rv32i_m/D/src/flt.d_b1-01.S",
+    "rv32i_m/D/src/flt.d_b19-01.S",
+    // "rv32i_m/D/src/fld-align-01.S", //missing right now from top of tree, should be returned when it comes back
+    // "rv32i_m/D/src/fsd-align-01.S", //https://github.com/riscv-non-isa/riscv-arch-test/issues/266
+    "rv32i_m/D/src/fmadd.d_b14-01.S",
+    "rv32i_m/D/src/fmadd.d_b16-01.S",
+    "rv32i_m/D/src/fmadd.d_b17-01.S",
+    "rv32i_m/D/src/fmadd.d_b18-01.S",
+    "rv32i_m/D/src/fmadd.d_b2-01.S",
+    "rv32i_m/D/src/fmadd.d_b3-01.S",
+    "rv32i_m/D/src/fmadd.d_b4-01.S",
+    "rv32i_m/D/src/fmadd.d_b5-01.S",
+    "rv32i_m/D/src/fmadd.d_b6-01.S",
+    "rv32i_m/D/src/fmadd.d_b7-01.S",
+    "rv32i_m/D/src/fmadd.d_b8-01.S",
+    "rv32i_m/D/src/fmax.d_b1-01.S",
+    "rv32i_m/D/src/fmax.d_b19-01.S",
+    "rv32i_m/D/src/fmin.d_b1-01.S",
+    "rv32i_m/D/src/fmin.d_b19-01.S",
+    "rv32i_m/D/src/fmsub.d_b14-01.S",
+    "rv32i_m/D/src/fmsub.d_b16-01.S",
+    "rv32i_m/D/src/fmsub.d_b17-01.S",
+    "rv32i_m/D/src/fmsub.d_b18-01.S",
+    "rv32i_m/D/src/fmsub.d_b2-01.S",
+    "rv32i_m/D/src/fmsub.d_b3-01.S",
+    "rv32i_m/D/src/fmsub.d_b4-01.S",
+    "rv32i_m/D/src/fmsub.d_b5-01.S",
+    "rv32i_m/D/src/fmsub.d_b6-01.S",
+    "rv32i_m/D/src/fmsub.d_b7-01.S",
+    "rv32i_m/D/src/fmsub.d_b8-01.S",
+    "rv32i_m/D/src/fmul.d_b1-01.S",
+    "rv32i_m/D/src/fmul.d_b2-01.S",
+    "rv32i_m/D/src/fmul.d_b3-01.S",
+    "rv32i_m/D/src/fmul.d_b4-01.S",
+    "rv32i_m/D/src/fmul.d_b5-01.S",
+    "rv32i_m/D/src/fmul.d_b6-01.S",
+    "rv32i_m/D/src/fmul.d_b7-01.S",
+    "rv32i_m/D/src/fmul.d_b8-01.S",
+    "rv32i_m/D/src/fmul.d_b9-01.S",
+    "rv32i_m/D/src/fmv.d.x_b25-01.S",
+    "rv32i_m/D/src/fmv.d.x_b26-01.S",
+    "rv32i_m/D/src/fmv.x.d_b1-01.S",
+    "rv32i_m/D/src/fmv.x.d_b22-01.S",
+    "rv32i_m/D/src/fmv.x.d_b23-01.S",
+    "rv32i_m/D/src/fmv.x.d_b24-01.S",
+    "rv32i_m/D/src/fmv.x.d_b27-01.S",
+    "rv32i_m/D/src/fmv.x.d_b28-01.S",
+    "rv32i_m/D/src/fmv.x.d_b29-01.S",
+    "rv32i_m/D/src/fnmadd.d_b14-01.S",
+    "rv32i_m/D/src/fnmadd.d_b16-01.S",
+    "rv32i_m/D/src/fnmadd.d_b17-01.S",
+    "rv32i_m/D/src/fnmadd.d_b18-01.S",
+    "rv32i_m/D/src/fnmadd.d_b2-01.S",
+    "rv32i_m/D/src/fnmadd.d_b3-01.S",
+    "rv32i_m/D/src/fnmadd.d_b4-01.S",
+    "rv32i_m/D/src/fnmadd.d_b5-01.S",
+    "rv32i_m/D/src/fnmadd.d_b6-01.S",
+    "rv32i_m/D/src/fnmadd.d_b7-01.S",
+    "rv32i_m/D/src/fnmadd.d_b8-01.S",
+    "rv32i_m/D/src/fnmsub.d_b14-01.S",
+    "rv32i_m/D/src/fnmsub.d_b16-01.S",
+    "rv32i_m/D/src/fnmsub.d_b17-01.S",
+    "rv32i_m/D/src/fnmsub.d_b18-01.S",
+    "rv32i_m/D/src/fnmsub.d_b2-01.S",
+    "rv32i_m/D/src/fnmsub.d_b3-01.S",
+    "rv32i_m/D/src/fnmsub.d_b4-01.S",
+    "rv32i_m/D/src/fnmsub.d_b5-01.S",
+    "rv32i_m/D/src/fnmsub.d_b6-01.S",
+    "rv32i_m/D/src/fnmsub.d_b7-01.S",
+    "rv32i_m/D/src/fnmsub.d_b8-01.S",
+    "rv32i_m/D/src/fsgnj.d_b1-01.S",
+    "rv32i_m/D/src/fsgnjn.d_b1-01.S",
+    "rv32i_m/D/src/fsgnjx.d_b1-01.S",
+    // "rv32i_m/D/src/fsqrt.d_b1-01.S",
+    // "rv32i_m/D/src/fsqrt.d_b20-01.S",
+    // "rv32i_m/D/src/fsqrt.d_b2-01.S",
+    // "rv32i_m/D/src/fsqrt.d_b3-01.S",
+    // "rv32i_m/D/src/fsqrt.d_b4-01.S",
+    // "rv32i_m/D/src/fsqrt.d_b5-01.S",
+    // "rv32i_m/D/src/fsqrt.d_b7-01.S",
+    // "rv32i_m/D/src/fsqrt.d_b8-01.S",
+    // "rv32i_m/D/src/fsqrt.d_b9-01.S",
+    "rv32i_m/D/src/fssub.d_b10-01.S",
+    "rv32i_m/D/src/fssub.d_b1-01.S",
+    "rv32i_m/D/src/fssub.d_b11-01.S",
+    "rv32i_m/D/src/fssub.d_b12-01.S",
+    "rv32i_m/D/src/fssub.d_b13-01.S",
+    "rv32i_m/D/src/fssub.d_b2-01.S",
+    "rv32i_m/D/src/fssub.d_b3-01.S",
+    "rv32i_m/D/src/fssub.d_b4-01.S",
+    "rv32i_m/D/src/fssub.d_b5-01.S",
+    "rv32i_m/D/src/fssub.d_b7-01.S",
+    "rv32i_m/D/src/fssub.d_b8-01.S"
 };
 
     string arch32priv[] = '{
@@ -1611,4 +1611,4 @@ string imperas32f[] = '{
  string wally32d[] = '{
     `WALLYTEST,
     "rv32i_m/D/src/WALLY-fld.S"
- };
\ No newline at end of file
+ };
diff --git a/tests/riscof/Makefile b/tests/riscof/Makefile
index 81e36b037..9547f721c 100644
--- a/tests/riscof/Makefile
+++ b/tests/riscof/Makefile
@@ -8,8 +8,8 @@ wally_workdir = $(work)/wally-riscv-arch-test
 current_dir = $(shell pwd)
 #XLEN    ?= 64
 
-#all: root build_rv32e build_wally build_arch 
-all: root fsd_fld_tempfix arch32 wally32  wally32e arch64 wally64
+#all: root fsd_fld_tempfix arch32 wally32  wally32e arch64 wally64
+all: root fsd_fld_tempfix arch32 
 
 root:
 	mkdir -p $(work_dir)
@@ -37,12 +37,10 @@ arch64:
 wally32:
 	riscof run --work-dir=$(work_dir) --config=config32.ini --suite=$(wally_dir)/riscv-test-suite/ --env=$(wally_dir)/riscv-test-suite/env --no-browser --no-dut-run
 	rsync -a $(work_dir)/rv32i_m/ $(wally_workdir)/rv32i_m/ || echo "error suppressed"
-#	rsync -a $(work_dir)/rv64i_m/ $(wally_workdir)/rv32i_m/ || echo "error suppressed"
 
 wally64:
 	riscof run --work-dir=$(work_dir) --config=config64.ini --suite=$(wally_dir)/riscv-test-suite/ --env=$(wally_dir)/riscv-test-suite/env --no-browser --no-dut-run
-	rsync -a $(work_dir)/rv32i_m/ $(wally_workdir)/rv64i_m/ || echo "error suppressed"
-#	rsync -a $(work_dir)/rv64i_m/ $(wally_workdir)/rv64i_m/ || echo "error suppressed"
+	rsync -a $(work_dir)/rv64i_m/ $(wally_workdir)/rv64i_m/ || echo "error suppressed"
 
 wally32e:
 	riscof run --work-dir=$(work_dir) --config=config32e.ini --suite=$(wally_dir)/riscv-test-suite/ --env=$(wally_dir)/riscv-test-suite/env --no-browser --no-dut-run
@@ -50,27 +48,6 @@ wally32e:
 	rsync -a $(work_dir)/rv32e_unratified/ $(wally_workdir)/rv32e_unratified/ || echo "error suppressed"
 
 
-build_arch: fsd_fld_tempfix
-	riscof run --work-dir=$(work_dir) --config=config$(XLEN).ini --suite=$(arch_dir)/riscv-test-suite/ --env=$(arch_dir)/riscv-test-suite/env --no-browser
-# rm -rf $(arch_workdir)/rv$(XLEN)i_m
-	rsync -a $(work_dir)/rv32i_m/ $(arch_workdir)/rv$(XLEN)i_m/ || echo "error suppressed"
-	rsync -a $(work_dir)/rv64i_m/ $(arch_workdir)/rv$(XLEN)i_m/ || echo "error suppressed"
-
-build_wally:
-	riscof run --work-dir=$(work_dir) --config=config$(XLEN).ini --suite=$(wally_dir)/riscv-test-suite/ --env=$(wally_dir)/riscv-test-suite/env --no-browser --no-dut-run
-# riscof --verbose debug run --work-dir=$(work_dir) --config=config$(XLEN).ini --suite=$(wally_dir)/riscv-test-suite/ --env=$(wally_dir)/riscv-test-suite/env --no-browser --no-dut-run 2>&1 | tee log.txt
-# rm -rf $(wally_workdir)/rv$(XLEN)i_m
-# mv -f $(work_dir)/rv$(XLEN)i_m $(wally_workdir)/
-	rsync -a $(work_dir)/rv32i_m/ $(wally_workdir)/rv$(XLEN)i_m/ || echo "error suppressed"
-	rsync -a $(work_dir)/rv64i_m/ $(wally_workdir)/rv$(XLEN)i_m/ || echo "error suppressed"
-
-build_rv32e:
-	sed 's,{0},$(current_dir),g;s,{1},32e,g' config.ini > config32e.ini
-	riscof run --work-dir=$(work_dir) --config=config32e.ini --suite=$(wally_dir)/riscv-test-suite/ --env=$(wally_dir)/riscv-test-suite/env --no-browser --no-dut-run
-# riscof --verbose debug run --work-dir=$(work_dir) --config=config32e.ini --suite=$(wally_dir)/riscv-test-suite/ --env=$(wally_dir)/riscv-test-suite/env --no-browser --no-dut-run 2>&1 | tee log.txt
-	rsync -a $(work_dir)/rv32i_m/ $(wally_workdir)/rv32i_m/ || echo "error suppressed"
-	rsync -a $(work_dir)/rv32e_unratified/ $(wally_workdir)/rv32e_unratified/ || echo "error suppressed"
-
 memfile: 
 	find $(work) -type f -name "*.elf" | grep "rv64i_m" | while read f; do riscv64-unknown-elf-elf2hex --bit-width 64 --input "$$f" --output "$$f.memfile"; done
 	find $(work) -type f -name "*.elf" | grep "rv32i_m" | while read f; do riscv64-unknown-elf-elf2hex --bit-width 32 --input "$$f" --output "$$f.memfile"; done
@@ -82,4 +59,4 @@ clean:
 	rm -f config32e.ini
 	rm -rf $(work_dir)
 	rm -rf $(wally_workdir)
-	rm -rf $(arch_workdir)
\ No newline at end of file
+	rm -rf $(arch_workdir)