Enable LR/SC tests, even for uniprocessors

diff --git a/isa/rv32ui/Makefrag b/isa/rv32ui/Makefrag
index 8124c02a093976d97d17387576285f35f53299d5..4bdebb5657438db829cfd0cb6e699b9b57333cda 100644 (file)
--- a/isa/rv32ui/Makefrag
+++ b/isa/rv32ui/Makefrag
@@ -6,6 +6,7 @@ rv32ui_sc_tests = \
        simple \
        add addi \
        amoadd_w amoand_w amomax_w amomaxu_w amomin_w amominu_w amoor_w amoxor_w amoswap_w \
+       lrsc \
        and andi \
        auipc \
        beq bge bgeu blt bltu bne \
@@ -25,9 +26,6 @@ rv32ui_sc_tests = \
        sub \
        xor xori \
 
-rv32ui_mc_tests = \
-       lrsc
-
 rv32ui_p_tests = $(addprefix rv32ui-p-, $(rv32ui_sc_tests))
 rv32ui_v_tests = $(addprefix rv32ui-v-, $(rv32ui_sc_tests))
 

diff --git a/isa/rv32ui/lrsc.S b/isa/rv32ui/lrsc.S
index 2aee81802a287f597ee2e38865e81f21f7f5b178..3a3d05a0e22127152a15aee05ecbd85aa30d43b6 100644 (file)
--- a/isa/rv32ui/lrsc.S
+++ b/isa/rv32ui/lrsc.S
@@ -32,6 +32,7 @@ TEST_CASE( 2, a4, 1, \
 )
 
 # make sure that sc with the wrong reservation fails.
+# TODO is this actually mandatory behavior?
 TEST_CASE( 3, a4, 1, \
   la a0, foo; \
   add a1, a0, 1024; \

diff --git a/isa/rv64ui/Makefrag b/isa/rv64ui/Makefrag
index e8391185830a174cb10f965d59baf4e53d115d70..4af25043073c363f158e1f12fa1ad07b9a9eedc6 100644 (file)
--- a/isa/rv64ui/Makefrag
+++ b/isa/rv64ui/Makefrag
@@ -6,6 +6,7 @@ rv64ui_sc_tests = \
        add addi addiw addw \
        amoadd_d amoand_d amomax_d amomaxu_d amomin_d amominu_d amoor_d amoxor_d amoswap_d \
        amoadd_w amoand_w amomax_w amomaxu_w amomin_w amominu_w amoor_w amoxor_w amoswap_w \
+       lrsc \
        and andi \
        auipc \
        beq bge bgeu blt bltu bne \
@@ -26,9 +27,6 @@ rv64ui_sc_tests = \
        sub subw \
        xor xori \
 
-rv64ui_mc_tests = \
-       lrsc
-
 rv64ui_p_tests = $(addprefix rv64ui-p-, $(rv64ui_sc_tests))
 rv64ui_v_tests = $(addprefix rv64ui-v-, $(rv64ui_sc_tests))
 

diff --git a/isa/rv64ui/lrsc.S b/isa/rv64ui/lrsc.S
index 6c4904efa79846337384db58e89a4349cc5faf33..9422739c6c5b6768617ad93459434916c1c22148 100644 (file)
--- a/isa/rv64ui/lrsc.S
+++ b/isa/rv64ui/lrsc.S
@@ -32,6 +32,7 @@ TEST_CASE( 2, a4, 1, \
 )
 
 # make sure that sc with the wrong reservation fails.
+# TODO is this actually mandatory behavior?
 TEST_CASE( 3, a4, 1, \
   la a0, foo; \
   add a1, a0, 1024; \