diff options
| author | Andrew Waterman <waterman@cs.berkeley.edu> | 2016-07-22 11:25:52 -0700 |
|---|---|---|
| committer | Andrew Waterman <waterman@cs.berkeley.edu> | 2016-07-22 11:26:57 -0700 |
| commit | d5fb1309c80bf57cb33e53b7fa6010fe6a374062 (patch) | |
| tree | 8700c3e74e5fb9193f956db82cfc97ab0db7ffe2 | |
| parent | d7bd2474c4474f0ca69c6d0adc4dd3501c91c5bc (diff) | |
| download | riscv-tests-d5fb1309c80bf57cb33e53b7fa6010fe6a374062.zip riscv-tests-d5fb1309c80bf57cb33e53b7fa6010fe6a374062.tar.gz riscv-tests-d5fb1309c80bf57cb33e53b7fa6010fe6a374062.tar.bz2 | |
Move dirty bit test to rv64si directory
Not sure this is quite right, since the test technically runs in M-mode.
Also, remove unused rdnpc/example tests.
| -rw-r--r-- | isa/rv64mi/Makefrag | 1 | ||||
| -rw-r--r-- | isa/rv64si/Makefrag | 1 | ||||
| -rw-r--r-- | isa/rv64si/dirty.S (renamed from isa/rv64mi/dirty.S) | 0 | ||||
| -rw-r--r-- | isa/rv64ui/Makefrag | 2 | ||||
| -rw-r--r-- | isa/rv64ui/example.S | 27 | ||||
| -rw-r--r-- | isa/rv64ui/rdnpc.S | 31 |
6 files changed, 2 insertions, 60 deletions
diff --git a/isa/rv64mi/Makefrag b/isa/rv64mi/Makefrag index 4ae8733..e4fa426 100644 --- a/isa/rv64mi/Makefrag +++ b/isa/rv64mi/Makefrag @@ -4,7 +4,6 @@ rv64mi_sc_tests = \ breakpoint \ - dirty \ csr \ mcsr \ illegal \ diff --git a/isa/rv64si/Makefrag b/isa/rv64si/Makefrag index 076ea59..c0dbce8 100644 --- a/isa/rv64si/Makefrag +++ b/isa/rv64si/Makefrag @@ -4,6 +4,7 @@ rv64si_sc_tests = \ csr \ + dirty \ ma_fetch \ scall \ wfi \ diff --git a/isa/rv64mi/dirty.S b/isa/rv64si/dirty.S index 0314cf5..0314cf5 100644 --- a/isa/rv64mi/dirty.S +++ b/isa/rv64si/dirty.S diff --git a/isa/rv64ui/Makefrag b/isa/rv64ui/Makefrag index aeeb560..1867ea5 100644 --- a/isa/rv64ui/Makefrag +++ b/isa/rv64ui/Makefrag @@ -7,7 +7,7 @@ rv64ui_sc_tests = \ and andi \ auipc \ beq bge bgeu blt bltu bne \ - example simple \ + simple \ fence_i \ jal jalr \ lb lbu lh lhu lw lwu ld \ diff --git a/isa/rv64ui/example.S b/isa/rv64ui/example.S deleted file mode 100644 index 6c45fbd..0000000 --- a/isa/rv64ui/example.S +++ /dev/null @@ -1,27 +0,0 @@ -# See LICENSE for license details. - -#***************************************************************************** -# simple.S -#----------------------------------------------------------------------------- -# -# This is the most basic self checking test. If your simulator does not -# pass thiss then there is little chance that it will pass any of the -# more complicated self checking tests. -# - -#include "riscv_test.h" -#include "test_macros.h" - -RVTEST_RV64U -RVTEST_CODE_BEGIN - -RVTEST_PASS - -RVTEST_CODE_END - - .data -RVTEST_DATA_BEGIN - - TEST_DATA - -RVTEST_DATA_END diff --git a/isa/rv64ui/rdnpc.S b/isa/rv64ui/rdnpc.S deleted file mode 100644 index e00839e..0000000 --- a/isa/rv64ui/rdnpc.S +++ /dev/null @@ -1,31 +0,0 @@ -# See LICENSE for license details. - -#***************************************************************************** -# rdnpc_w.S -#----------------------------------------------------------------------------- -# -# Test rdnpc instruction. -# - -#include "riscv_test.h" -#include "test_macros.h" - -RVTEST_RV64U -RVTEST_CODE_BEGIN - - TEST_CASE(2, a0, 4, \ - rdnpc a0; \ - jal 1f; \ - 1: sub a0, ra, a0; \ - ) - - TEST_PASSFAIL - -RVTEST_CODE_END - - .data -RVTEST_DATA_BEGIN - - TEST_DATA - -RVTEST_DATA_END |