From 6293d9323fa85afa282750b4ecfa34eba3bde57d Mon Sep 17 00:00:00 2001 From: Daniel Benusovich Date: Thu, 22 Nov 2018 15:42:25 -0800 Subject: [PATCH] Updating sv_addw_eldwidth test to use nonload version of macro --- isa/rv64ui/sv_addw_elwidth.S | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/isa/rv64ui/sv_addw_elwidth.S b/isa/rv64ui/sv_addw_elwidth.S index 19a160c..c501d0b 100644 --- a/isa/rv64ui/sv_addw_elwidth.S +++ b/isa/rv64ui/sv_addw_elwidth.S @@ -13,37 +13,37 @@ RVTEST_RV64U # Define TVM used by program. RVTEST_CODE_BEGIN # Start of test code. # TODO: add "addw" argument, add testdata argument - SV_ELWIDTH_TEST( addw, SV_LDD_DATA, testdata, 8, 3, 0, 0, 0, 1, 1, 1, + SV_ELWIDTH_NONLOAD_TEST( addw, SV_LDD_DATA, testdata, 8, 3, 0, 0, 0, 1, 1, 1, 0xffffffff8b6bab8b, 0xffffffff88684828, 0x0000000000000000 ) - SV_ELWIDTH_TEST( addw, SV_LDD_DATA, testdata, 8, 3, 0, 0, 3, 1, 1, 1, + SV_ELWIDTH_NONLOAD_TEST( addw, SV_LDD_DATA, testdata, 8, 3, 0, 0, 3, 1, 1, 1, 0x886848288b6bab8b, 0xa5a5a5a500000000, 0xa5a5a5a5a5a5a5a5 ) - SV_ELWIDTH_TEST( addw, SV_LDD_DATA, testdata, 8, 3, 1, 1, 0, 1, 1, 1, + SV_ELWIDTH_NONLOAD_TEST( addw, SV_LDD_DATA, testdata, 8, 3, 1, 1, 0, 1, 1, 1, 0xffffffffffffff8b, 0xffffffffffffffab, 0x000000000000006b ) - SV_ELWIDTH_TEST( addw, SV_LDD_DATA, testdata, 8, 3, 1, 1, 3, 1, 1, 1, + SV_ELWIDTH_NONLOAD_TEST( addw, SV_LDD_DATA, testdata, 8, 3, 1, 1, 3, 1, 1, 1, 0xffffffabffffff8b, 0xa5a5a5a50000006b, 0xa5a5a5a5a5a5a5a5 ) - SV_ELWIDTH_TEST( addw, SV_LDD_DATA, testdata, 8, 3, 1, 1, 2, 1, 1, 1, + SV_ELWIDTH_NONLOAD_TEST( addw, SV_LDD_DATA, testdata, 8, 3, 1, 1, 2, 1, 1, 1, 0xa5a5006bffabff8b, 0xa5a5a5a5a5a5a5a5, 0xa5a5a5a5a5a5a5a5 ) - SV_ELWIDTH_TEST( addw, SV_LDD_DATA, testdata, 8, 3, 1, 1, 1, 1, 1, 1, + SV_ELWIDTH_NONLOAD_TEST( addw, SV_LDD_DATA, testdata, 8, 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, SV_LDD_DATA, testdata, 8, 3, 0, 0, 0, 1, 1, 0, + SV_ELWIDTH_NONLOAD_TEST( addw, SV_LDD_DATA, testdata, 8, 3, 0, 0, 0, 1, 1, 0, 0xffffffff8b6bab8b, 0xa5a5a5a5a5a5a5a5, 0xa5a5a5a5a5a5a5a5 ) - SV_ELWIDTH_TEST( addw, SV_LDD_DATA, testdata, 8, 3, 3, 3, 3, 1, 1, 0, + SV_ELWIDTH_NONLOAD_TEST( addw, SV_LDD_DATA, testdata, 8, 3, 3, 3, 3, 1, 1, 0, 0xffffffff8b6bab8b, 0xa5a5a5a5a5a5a5a5, 0xa5a5a5a5a5a5a5a5 ) - SV_ELWIDTH_TEST( addw, SV_LDD_DATA, testdata, 8, 3, 2, 2, 3, 1, 1, 0, + SV_ELWIDTH_NONLOAD_TEST( addw, SV_LDD_DATA, testdata, 8, 3, 2, 2, 3, 1, 1, 0, 0xffffffffffffab8b, 0xa5a5a5a5a5a5a5a5, 0xa5a5a5a5a5a5a5a5 ) - SV_ELWIDTH_TEST( addw, SV_LDD_DATA, testdata, 8, 3, 3, 2, 3, 1, 1, 0, + SV_ELWIDTH_NONLOAD_TEST( addw, SV_LDD_DATA, testdata, 8, 3, 3, 2, 3, 1, 1, 0, 0x000000004232ab8b, 0xa5a5a5a5a5a5a5a5, 0xa5a5a5a5a5a5a5a5 ) - SV_ELWIDTH_TEST( addw, SV_LDD_DATA, testdata, 8, 3, 2, 3, 3, 1, 1, 0, + SV_ELWIDTH_NONLOAD_TEST( addw, SV_LDD_DATA, testdata, 8, 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, SV_LDD_DATA, testdata, 8, 3, 0, 0, 0, 0, 1, 1, + SV_ELWIDTH_NONLOAD_TEST( addw, SV_LDD_DATA, testdata, 8, 3, 0, 0, 0, 0, 1, 1, 0xffffffff8b6bab8b, 0xffffffff89694929, 0x0000000042322212 ) - SV_ELWIDTH_TEST( addw, SV_LDD_DATA, testdata, 8, 3, 0, 0, 3, 0, 1, 1, + SV_ELWIDTH_NONLOAD_TEST( addw, SV_LDD_DATA, testdata, 8, 3, 0, 0, 3, 0, 1, 1, 0x896949298b6bab8b, 0xa5a5a5a542322212, 0xa5a5a5a5a5a5a5a5 ) -- 2.30.2