fix up c_lwsp and predicated test

[riscv-tests.git] / isa / rv64ui / sv_ld_elwidth_offs.S

diff --git a/isa/rv64ui/sv_ld_elwidth_offs.S b/isa/rv64ui/sv_ld_elwidth_offs.S
index 31ac3af4ed53706ad92b25d3b9df721df041eb02..bb23a0819e358cfa89882410026ecdbca7c7ee27 100644 (file)
--- a/isa/rv64ui/sv_ld_elwidth_offs.S
+++ b/isa/rv64ui/sv_ld_elwidth_offs.S
@@ -3,7 +3,7 @@
 
 RVTEST_RV64U        # Define TVM used by program.
 
-#define SV_ELWIDTH_TEST( inst, vl, elwidth, wid1, wid2, \
+#define SV_ELWIDTH_TEST( inst, vl, wid1, wid2, \
                          testdata, expect1, expect2, expect3 ) \
                                                         \
         la x12, testdata ;                              \
@@ -36,19 +36,19 @@ RVTEST_RV64U        # Define TVM used by program.
 # Test code region.
 RVTEST_CODE_BEGIN   # Start of test code.
 
-        SV_ELWIDTH_TEST(  ld , 2, 8, SV_W_DFLT, SV_W_DFLT, testdata1,
+        SV_ELWIDTH_TEST(  ld , 2, SV_W_DFLT, SV_W_DFLT, testdata1,
                 0x8979695949392919,  0x8777675747372717,  0xa5a5a5a5a5a5a5a5 )
-        SV_ELWIDTH_TEST(  ld , 3, 8, SV_W_DFLT, SV_W_DFLT, testdata1,
+        SV_ELWIDTH_TEST(  ld , 3, SV_W_DFLT, SV_W_DFLT, testdata1,
                 0x8979695949392919,  0x8777675747372717,  0x8676665646362616 )
-        SV_ELWIDTH_TEST(  ld , 3, 8, SV_W_16BIT, SV_W_DFLT, testdata1,
+        SV_ELWIDTH_TEST(  ld , 3, SV_W_16BIT, SV_W_DFLT, testdata1,
                 0x0000000000002919,  0x0000000000004939,  0x0000000000006959 )
-        SV_ELWIDTH_TEST(  ld , 5, 8, SV_W_16BIT, SV_W_32BIT, testdata1,
+        SV_ELWIDTH_TEST(  ld , 5, SV_W_16BIT, SV_W_32BIT, testdata1,
                 0x0000493900002919,  0xffff897900006959,  0xa5a5a5a500002717 )
-        SV_ELWIDTH_TEST(  ld , 5, 8, SV_W_32BIT, SV_W_16BIT, testdata1,
+        SV_ELWIDTH_TEST(  ld , 5, SV_W_32BIT, SV_W_16BIT, testdata1,
                 0x6757271769592919,  0xa5a5a5a5a5a52616,  0xa5a5a5a5a5a5a5a5 )
-        SV_ELWIDTH_TEST(  ld , 7, 8, SV_W_16BIT, SV_W_8BIT, testdata1,
+        SV_ELWIDTH_TEST(  ld , 7, SV_W_16BIT, SV_W_8BIT, testdata1,
                 0xa557371779593919,  0xa5a5a5a5a5a5a5a5,  0xa5a5a5a5a5a5a5a5 )
-        SV_ELWIDTH_TEST(  ld , 11, 8, SV_W_8BIT, SV_W_16BIT, testdata1,
+        SV_ELWIDTH_TEST(  ld , 11, SV_W_8BIT, SV_W_16BIT, testdata1,
                 0x0049003900290019,  0xff89007900690059,  0xa5a5003700270017 )
         RVTEST_PASS           # Signal success.
 fail: