From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Thu, 1 Nov 2018 14:17:52 +0000 (+0000)
Subject: add alignment on testdata
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f16ed61702e26825ccf7d1ef96c212395c53d42a;p=riscv-tests.git

add alignment on testdata
---

diff --git a/isa/rv64uf/sv_fld_elwidth.S b/isa/rv64uf/sv_fld_elwidth.S
index 48bdff5..ee8a8e5 100644
--- a/isa/rv64uf/sv_fld_elwidth.S
+++ b/isa/rv64uf/sv_fld_elwidth.S
@@ -3,6 +3,36 @@
 
 RVTEST_RV64UF        # Define TVM used by program.
 
+#define SV_ELWIDTH_TESTW( inst, vl, elwidth, wid1, wid2, \
+                         testdata, ans ) \
+                                                        \
+        la x12, testdata ;                              \
+        la x13, (testdata+elwidth);                              \
+        la x14, (testdata+elwidth*2);                              \
+        la x15, (testdata+elwidth*3);                              \
+        la x16, (testdata+elwidth*4);                              \
+        la x17, (testdata+elwidth*5);                              \
+                                                        \
+        li x1, 0xa5a5a5a5a5a5a5a5;                                      \
+        fmv.d.x f28, x1;                                   \
+        fmv.d.x f29, x1;                                   \
+        fmv.d.x f30, x1;                                   \
+                                                        \
+        SET_SV_MVL( vl);                                  \
+        SET_SV_2CSRS( SV_REG_CSR( 1, 12, wid1, 12, 1),        \
+                      SV_REG_CSR( 0, 28, wid2, 28, 1));       \
+        SET_SV_VL( vl );                                   \
+                                                        \
+        inst   f28, 0(x12);                              \
+                                                        \
+        CLR_SV_CSRS();                                  \
+        SET_SV_VL( 1);                                   \
+        SET_SV_MVL( 1);                                  \
+                                                        \
+        TEST_SV_FW(0, f28, ans, 0);                    \
+        TEST_SV_FW(0, f29, ans, 4);                    \
+        TEST_SV_FW(0, f30, ans, 8);
+
 #define SV_ELWIDTH_TEST( inst, vl, elwidth, wid1, wid2, \
                          testdata, ans ) \
                                                         \
@@ -46,7 +76,14 @@ RVTEST_CODE_BEGIN   # Start of test code.
         SV_ELWIDTH_TEST( fld , 3, 8, SV_W_16BIT, SV_W_DFLT, testdata3, answer3)
         SV_ELWIDTH_TEST( fld , 5, 8, SV_W_16BIT, SV_W_32BIT, testdata3, answer4)
         SV_ELWIDTH_TEST( fld , 6, 8, SV_W_32BIT, SV_W_16BIT, testdata4, answer5)
+
 /*
+        SV_ELWIDTH_TESTW(flw , 3, 8, SV_W_DFLT, SV_W_DFLT, testdata1, answer1 )
+        SV_ELWIDTH_TESTW(flw , 3, 8, SV_W_16BIT, SV_W_DFLT, testdata3, answer3)
+        SV_ELWIDTH_TESTW(flw , 5, 8, SV_W_16BIT, SV_W_32BIT, testdata3, answer4)
+        SV_ELWIDTH_TESTW(flw , 6, 8, SV_W_32BIT, SV_W_16BIT, testdata4, answer5)
+        SV_ELWIDTH_TESTW(flw , 6, 8, SV_W_DFLT, SV_W_16BIT, testdata6, answer5)
+
         SV_ELWIDTH_TEST(  ld , 5, 8, SV_W_32BIT, SV_W_16BIT, testdata1,
                 0x6757271769592919,  0xa5a5a5a5a5a52616,  0xa5a5a5a5a5a5a5a5 )
         SV_ELWIDTH_TEST(  ld , 7, 8, SV_W_16BIT, SV_W_8BIT, testdata1,
@@ -71,17 +108,20 @@ testdata1:
         .dword 0x8171615141312111
         .dword 0x8373635343332313
 
+        .align 3
 answer1:
         .dword 0x8979695949392919
         .dword 0x8777675747372717
         .dword 0xa5a5a5a5a5a5a5a5
 
+        .align 3
 answer2:
 
         .dword 0x8979695949392919
         .dword 0x8777675747372717
         .dword 0x8676665646362616
 
+        .align 3
 testdata3:
         .dword 0x63d03c0051805140
         .dword 0x000000000000E480
@@ -90,12 +130,14 @@ testdata3:
         .dword 0x8171615141312111
         .dword 0x8373635343332313
 
+        .align 3
 answer3:
 
         .double 42.0
         .double 44.0
         .double 1.0
 
+        .align 3
 answer4:
 
         .float 42.0
@@ -105,6 +147,7 @@ answer4:
         .float -1152.0
         .word 0xa5a5a5a5
 
+        .align 3
 testdata4:
 
         .float 42.0
@@ -115,6 +158,7 @@ testdata4:
         .float -82.0
         .word 0xa5a5a5a5
 
+        .align 3
 answer5:
 
         .short 0x5140 # 42 fp16
@@ -127,6 +171,23 @@ answer5:
         .short 0xa5a5
         .dword 0xa5a5a5a5a5a5a5a5
 
+        .align 3
+testdata6:
+
+        .float 42.0
+        .float 44.0
+        .float 1.0
+        .float 1000.0
+        .float -1152.0
+        .float -82.0
+        .dword 0x0
+        .dword 0x0
+        .dword 0x0
+        .dword 0x0
+        .dword 0x0
+        .dword 0x0
+        .dword 0x0
+
 # Output data section.
 RVTEST_DATA_BEGIN   # Start of test output data region.
         .align 3