diff options
| author | Kathlene Hurt <kathlenerose.hurt@sifive.com> | 2020-12-16 16:54:30 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-16 14:54:30 -0800 |
| commit | b0b3d24db5e85fd07a608f179de1714cef2ae944 (patch) | |
| tree | 7488b83821abe73d418cb7f2752160b79613ce68 /isa | |
| parent | 67cb46859f51e71d4fc17df22673d7410056fbb7 (diff) | |
| download | riscv-tests-b0b3d24db5e85fd07a608f179de1714cef2ae944.zip riscv-tests-b0b3d24db5e85fd07a608f179de1714cef2ae944.tar.gz riscv-tests-b0b3d24db5e85fd07a608f179de1714cef2ae944.tar.bz2 | |
Refactor rv64ud structural test to match format of other tests (#311)
* Refactored rv64ud structural test to use pass/fail macros and test numbers
* More clean up so test actually jumps to fail label
Diffstat (limited to 'isa')
| -rw-r--r-- | isa/rv64ud/structural.S | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/isa/rv64ud/structural.S b/isa/rv64ud/structural.S index 3cf87aa..726275a 100644 --- a/isa/rv64ud/structural.S +++ b/isa/rv64ud/structural.S @@ -19,7 +19,9 @@ li x12, 1 li x2, 0x3FF0000000000000 li x1, 0x3F800000 -#define TEST(nops, errcode) \ +#define TEST(testnum, nops) \ +test_ ## testnum: \ + li TESTNUM, testnum; \ fmv.d.x f4, x0 ;\ fmv.s.x f3, x0 ;\ fmv.d.x f2, x2 ;\ @@ -32,21 +34,21 @@ li x1, 0x3F800000 fmv.x.d x4, f4 ;\ fmv.x.s x5, f3 ;\ beq x1, x5, 2f ;\ - RVTEST_FAIL ;\ + j fail;\ 2:beq x2, x4, 2f ;\ - RVTEST_FAIL; \ + j fail; \ 2:fmv.d.x f2, zero ;\ fmv.s.x f1, zero ;\ -TEST(;,2) -TEST(nop,4) -TEST(nop;nop,6) -TEST(nop;nop;nop,8) -TEST(nop;nop;nop;nop,10) -TEST(nop;nop;nop;nop;nop,12) -TEST(nop;nop;nop;nop;nop;nop,14) +TEST(1,;) +TEST(2,nop) +TEST(3,nop;nop) +TEST(4,nop;nop;nop) +TEST(5,nop;nop;nop;nop) +TEST(6,nop;nop;nop;nop;nop) +TEST(7,nop;nop;nop;nop;nop;nop) -RVTEST_PASS +TEST_PASSFAIL RVTEST_CODE_END |