Fixed an issue where riscv-arch-test tests were not working.

ckb-vm-test-suite/ckb-vm-arch-test/Makefile

@@ -40,7 +40,7 @@ $(info RISCV_DEVICE: ${RISCV_DEVICE} [origin: $(origin RISCV_DEVICE)])
 $(info =============================================================================)
 $(info )
 
-RVTEST_DEFINES = 
+RVTEST_DEFINES = -DTEST_CASE_1
 ifeq ($(RISCV_ASSERT),1)
 	RVTEST_DEFINES += -DRVMODEL_ASSERT
 endif

ckb-vm-test-suite/ckb-vm-arch-test/riscv-target/ckb-vm/device/rv64i_m/Makefile.include

@@ -16,7 +16,7 @@ RISCV_GCC_OPTS ?= -static -mcmodel=medany -fvisibility=hidden -nostdlib -DXLEN=$
 
 
 COMPILE_TARGET=\
-	$$(RISCV_GCC) $(2) $$(RISCV_GCC_OPTS) \
+	$$(RISCV_GCC) $(1) $$(RISCV_GCC_OPTS) \
 		-I$(TARGETDIR)/$(RISCV_TARGET)/ \
 		-I$(ROOTDIR)/../riscv-arch-test/riscv-test-suite/env/ \
 		-T$(TARGETDIR)/$(RISCV_TARGET)/link.ld $$< \

ckb-vm-test-suite/ckb-vm-arch-test/riscv-target/ckb-vm/model_test.h

@@ -14,12 +14,18 @@
 //-----------------------------------------------------------------------
 
 #define RVMODEL_IO_WRITE_STR(_SP, _STR)
+
+#ifdef DISABLE_GPR_EQ
+// TODO https://github.com/riscv-non-isa/riscv-arch-test/issues/540
+#define RVMODEL_IO_ASSERT_GPR_EQ(_SP, _R, _I)
+#else
 #define RVMODEL_IO_ASSERT_GPR_EQ(_SP, _R, _I) \
   li _SP, _I;                                 \
   beq _R, _SP, 20002f;                        \
   li TESTNUM, 100;                            \
   RVTEST_FAIL;                                \
   20002:
+#endif
 
 //-----------------------------------------------------------------------
 // RV Compliance Macros
@@ -47,4 +53,20 @@
 #define RVMODEL_CLEAR_MTIMER_INT
 #define RVMODEL_CLEAR_MEXT_INT
 
+//-----------------------------------------------------------------------
+// Pass/Fail macros expected by arch tests
+//-----------------------------------------------------------------------
+
+#define TESTNUM gp
+
+#define RVTEST_PASS \
+  li a0, 0;         \
+  li a7, 93;        \
+  ecall;
+
+#define RVTEST_FAIL \
+  li a7, 93;        \
+  addi a0, TESTNUM, 0; \
+  ecall;
+
 #endif

ckb-vm-test-suite/ckb-vm-arch-test/riscv-test-suite/rv64i_m/B/Makefile

@@ -1,3 +1,3 @@
 include ../../Makefile.include
 
-$(eval $(call compile_template,-march=rv64im -mabi=lp64 -DXLEN=$(XLEN)))
+$(eval $(call compile_template,-march=rv64imac_zba_zbb_zbc_zbs -mabi=lp64 -DXLEN=$(XLEN) -DDISABLE_GPR_EQ))

ckb-vm-test-suite/ckb-vm-arch-test/riscv-test-suite/rv64i_m/B/Makefrag

@@ -71,8 +71,7 @@ rv64im_sc_tests = \
   sh3add.uw-01 \
   slli.uw-01 \
   xnor-01 \
-  zext.h_64-01 \
-  zext.h-01
+  zext.h_64-01
 
 rv64im_tests = $(addsuffix .elf, $(rv64im_sc_tests))