from daniel benusovich, patch to move SV_ELWIDTH to sv_test_macros.h

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

diff --git a/isa/rv64ui/sv_addw_elwidth.S b/isa/rv64ui/sv_addw_elwidth.S
index 304ca6e3611a0162166bd21862b1a43cdfc0b0b1..7047ff0ef9060d521c3b8bb624b88a5bde5aa200 100644 (file)
--- a/isa/rv64ui/sv_addw_elwidth.S
+++ b/isa/rv64ui/sv_addw_elwidth.S
@@ -3,33 +3,6 @@
 
 RVTEST_RV64U        # Define TVM used by program.
 
-#define SV_ELWIDTH_TEST( wid1, wid2, wid3, expect1, expect2 ) \
-                                                        \
-        SV_LDD_DATA( x4, testdata   , 0);               \
-        SV_LDD_DATA( x5, testdata+8 , 0);               \
-        SV_LDD_DATA( x12, testdata+16, 0);               \
-        SV_LDD_DATA( x13, testdata+24, 0);               \
-                                                        \
-        li x14, 0;                                      \
-        li x15, 0;                                      \
-                                                        \
-        SET_SV_MVL( 2);                                  \
-        SET_SV_3CSRS( SV_REG_CSR( 1, 4, wid1, 4, 1),       \
-                      SV_REG_CSR( 1, 12, wid2, 12, 1),        \
-                      SV_REG_CSR( 1, 14, wid3, 14, 1));       \
-        SET_SV_VL( 2);                                   \
-                                                        \
-        addw   x14, x4, x12;                              \
-                                                        \
-        CLR_SV_CSRS();                                  \
-        SET_SV_VL( 1);                                   \
-        SET_SV_MVL( 1);                                  \
-                                                        \
-        TEST_SV_IMM( x14, expect1 );                         \
-        TEST_SV_IMM( x15, expect2 );                       \
-        TEST_SV_IMM( x12, 0x0000005242322212);                       \
-        TEST_SV_IMM( x13, 0x0000005141312111);
-
 
 # SV test: vector-vector add
 #
@@ -39,17 +12,46 @@ RVTEST_RV64U        # Define TVM used by program.
 # Test code region.
 RVTEST_CODE_BEGIN   # Start of test code.
 
-        # 
-        SV_ELWIDTH_TEST(  0, 0, 0, 0xffffffff8b6bab8b,  0xffffffff88684828 )
-        SV_ELWIDTH_TEST(  0, 0, 3, 0x886848288b6bab8b,  0x0000000000000000 )
-        SV_ELWIDTH_TEST(  1, 1, 0, 0xffffffffffffff8b,  0xffffffffffffffab )
-        SV_ELWIDTH_TEST(  1, 1, 3, 0xffffffabffffff8b,  0x0000000000000000 )
-        SV_ELWIDTH_TEST(  1, 1, 2, 0x00000000ffabff8b,  0x0000000000000000 )
-        SV_ELWIDTH_TEST(  1, 1, 1, 0x000000000000ab8b,  0x0000000000000000 )
+        # TODO: add "addw" argument, add testdata argument
+        SV_ELWIDTH_TEST( addw, testdata, 3, 0, 0, 0, 1, 1, 1,
+                0xffffffff8b6bab8b,  0xffffffff88684828,  0x0000000000000000 )
+        SV_ELWIDTH_TEST(  addw, testdata, 3, 0, 0, 3, 1, 1, 1,
+                0x886848288b6bab8b,  0xa5a5a5a500000000,  0xa5a5a5a5a5a5a5a5 )
+        SV_ELWIDTH_TEST(  addw, testdata, 3, 1, 1, 0, 1, 1, 1,
+                0xffffffffffffff8b,  0xffffffffffffffab,  0x000000000000006b )
+        SV_ELWIDTH_TEST(  addw, testdata, 3, 1, 1, 3, 1, 1, 1,
+                0xffffffabffffff8b,  0xa5a5a5a50000006b,  0xa5a5a5a5a5a5a5a5 )
+        SV_ELWIDTH_TEST(  addw, testdata, 3, 1, 1, 2, 1, 1, 1,
+                0xa5a5006bffabff8b,  0xa5a5a5a5a5a5a5a5,  0xa5a5a5a5a5a5a5a5 )
+        SV_ELWIDTH_TEST(  addw, testdata, 3, 1, 1, 1, 1, 1, 1,
+                0xa5a5a5a5a56bab8b,  0xa5a5a5a5a5a5a5a5,  0xa5a5a5a5a5a5a5a5 )
+
+        # these test a scalar destination, for sign-extension on different
+        # widths of source/dest.
+        SV_ELWIDTH_TEST(  addw, testdata, 3, 0, 0, 0, 1, 1, 0,
+                0xffffffff8b6bab8b,  0xa5a5a5a5a5a5a5a5,  0xa5a5a5a5a5a5a5a5 )
+        SV_ELWIDTH_TEST(  addw, testdata, 3, 3, 3, 3, 1, 1, 0,
+                0xffffffff8b6bab8b,  0xa5a5a5a5a5a5a5a5,  0xa5a5a5a5a5a5a5a5 )
+        SV_ELWIDTH_TEST(  addw, testdata, 3, 2, 2, 3, 1, 1, 0,
+                0xffffffffffffab8b,  0xa5a5a5a5a5a5a5a5,  0xa5a5a5a5a5a5a5a5 )
+        SV_ELWIDTH_TEST(  addw, testdata, 3, 3, 2, 3, 1, 1, 0,
+                0x000000004232ab8b,  0xa5a5a5a5a5a5a5a5,  0xa5a5a5a5a5a5a5a5 )
+        SV_ELWIDTH_TEST(  addw, testdata, 3, 2, 3, 3, 1, 1, 0,
+                0x000000004939ab8b,  0xa5a5a5a5a5a5a5a5,  0xa5a5a5a5a5a5a5a5 )
+
+        # these test scalar sources, for sign-extension on different
+        # widths of source/dest.
+        SV_ELWIDTH_TEST(  addw, testdata, 3, 0, 0, 0, 0, 1, 1,
+                0xffffffff8b6bab8b,  0xffffffff89694929,  0x0000000042322212 )
+        SV_ELWIDTH_TEST(  addw, testdata, 3, 0, 0, 3, 0, 1, 1,
+                0x896949298b6bab8b,  0xa5a5a5a542322212,  0xa5a5a5a5a5a5a5a5 )
+
+
 
         RVTEST_PASS           # Signal success.
 fail:
         RVTEST_FAIL
+
 RVTEST_CODE_END     # End of test code.
 
 # Input data section.
@@ -59,8 +61,10 @@ RVTEST_CODE_END     # End of test code.
 testdata:
         .dword 0x0000005949398979
         .dword 0x0000005747372717
+        .dword 0x0000000000000000
         .dword 0x0000005242322212
         .dword 0x0000005141312111
+        .dword 0x0000000000000000
 
 # Output data section.
 RVTEST_DATA_BEGIN   # Start of test output data region.