diff options
| author | Eric Love <ericlove@s144.Millennium.Berkeley.EDU> | 2014-01-23 16:42:19 -0800 |
|---|---|---|
| committer | Eric Love <ericlove@s144.Millennium.Berkeley.EDU> | 2014-01-23 16:42:19 -0800 |
| commit | 68b9b6b1e83af86bff8c4a36c3e2d186e21bbb90 (patch) | |
| tree | b6ff10712d6ea26b2873b5c2dbcc7d961ea81330 | |
| parent | 53f417a9acfc2f2517aa93be38875d17b408ec59 (diff) | |
| download | riscv-tests-68b9b6b1e83af86bff8c4a36c3e2d186e21bbb90.zip riscv-tests-68b9b6b1e83af86bff8c4a36c3e2d186e21bbb90.tar.gz riscv-tests-68b9b6b1e83af86bff8c4a36c3e2d186e21bbb90.tar.bz2 | |
Fixed srl, srli
| -rw-r--r-- | isa/rv32ui/Makefrag | 2 | ||||
| -rw-r--r-- | isa/rv32ui/srl.S | 8 | ||||
| -rw-r--r-- | isa/rv32ui/srli.S | 50 |
3 files changed, 35 insertions, 25 deletions
diff --git a/isa/rv32ui/Makefrag b/isa/rv32ui/Makefrag index 8d6acea..7d186e2 100644 --- a/isa/rv32ui/Makefrag +++ b/isa/rv32ui/Makefrag @@ -20,7 +20,7 @@ rv32ui_sc_tests = \ sll slli \ slt slti \ sra srai \ - srl #srli \ + srl srli \ #sub \ #xor xori \ diff --git a/isa/rv32ui/srl.S b/isa/rv32ui/srl.S index 8f8719d..d1de5ce 100644 --- a/isa/rv32ui/srl.S +++ b/isa/rv32ui/srl.S @@ -35,10 +35,10 @@ RVTEST_CODE_BEGIN # Verify that shifts only use bottom five bits - TEST_RR_OP( 17, srl, 0x21212121, 0x21212121, 0xffffffc0 ); - TEST_RR_OP( 18, srl, 0x10909090, 0x21212121, 0xffffffc1 ); - TEST_RR_OP( 19, srl, 0x00424242, 0x21212121, 0xffffffc7 ); - TEST_RR_OP( 20, srl, 0x00008484, 0x21212121, 0xffffffce ); + TEST_RR_OP( 17, srl, 0x21212121, 0x21212121, 0xffffffe0 ); + TEST_RR_OP( 18, srl, 0x10909090, 0x21212121, 0xffffffe1 ); + TEST_RR_OP( 19, srl, 0x00424242, 0x21212121, 0xffffffe7 ); + TEST_RR_OP( 20, srl, 0x00008484, 0x21212121, 0xffffffee ); TEST_RR_OP( 21, srl, 0x00000000, 0x21212121, 0xffffffff ); #------------------------------------------------------------- diff --git a/isa/rv32ui/srli.S b/isa/rv32ui/srli.S index bcda999..61e01fb 100644 --- a/isa/rv32ui/srli.S +++ b/isa/rv32ui/srli.S @@ -15,17 +15,17 @@ RVTEST_CODE_BEGIN # Arithmetic tests #------------------------------------------------------------- - TEST_IMM_OP( 2, srli, 0x80000000, 0x80000000, 0 ); - TEST_IMM_OP( 3, srli, 0xc0000000, 0x80000000, 1 ); - TEST_IMM_OP( 4, srli, 0xff000000, 0x80000000, 7 ); - TEST_IMM_OP( 5, srli, 0xfffe0000, 0x80000000, 14 ); - TEST_IMM_OP( 6, srli, 0xffffffff, 0x80000001, 31 ); + TEST_IMM_OP( 2, srli, 0xffff8000, 0xffff8000, 0 ); + TEST_IMM_OP( 3, srli, 0x7fffc000, 0xffff8000, 1 ); + TEST_IMM_OP( 4, srli, 0x01ffff00, 0xffff8000, 7 ); + TEST_IMM_OP( 5, srli, 0x0003fffe, 0xffff8000, 14 ); + TEST_IMM_OP( 6, srli, 0x0001ffff, 0xffff8001, 15 ); TEST_IMM_OP( 7, srli, 0xffffffff, 0xffffffff, 0 ); - TEST_IMM_OP( 8, srli, 0xffffffff, 0xffffffff, 1 ); - TEST_IMM_OP( 9, srli, 0xffffffff, 0xffffffff, 7 ); - TEST_IMM_OP( 10, srli, 0xffffffff, 0xffffffff, 14 ); - TEST_IMM_OP( 11, srli, 0xffffffff, 0xffffffff, 31 ); + TEST_IMM_OP( 8, srli, 0x7fffffff, 0xffffffff, 1 ); + TEST_IMM_OP( 9, srli, 0x01ffffff, 0xffffffff, 7 ); + TEST_IMM_OP( 10, srli, 0x0003ffff, 0xffffffff, 14 ); + TEST_IMM_OP( 11, srli, 0x00000001, 0xffffffff, 31 ); TEST_IMM_OP( 12, srli, 0x21212121, 0x21212121, 0 ); TEST_IMM_OP( 13, srli, 0x10909090, 0x21212121, 1 ); @@ -33,26 +33,36 @@ RVTEST_CODE_BEGIN TEST_IMM_OP( 15, srli, 0x00008484, 0x21212121, 14 ); TEST_IMM_OP( 16, srli, 0x00000000, 0x21212121, 31 ); + # Verify that shifts only use bottom five bits + + TEST_IMM_OP( 17, srli, 0x21212121, 0x21212121, 0xffffffc0 ); + TEST_IMM_OP( 18, srli, 0x10909090, 0x21212121, 0xffffffc1 ); + TEST_IMM_OP( 19, srli, 0x00424242, 0x21212121, 0xffffffc7 ); + TEST_IMM_OP( 20, srli, 0x00008484, 0x21212121, 0xffffffce ); + + + #------------------------------------------------------------- # Source/Destination tests #------------------------------------------------------------- - TEST_IMM_SRC1_EQ_DEST( 17, srli, 0xff000000, 0x80000000, 7 ); + TEST_IMM_SRC1_EQ_DEST( 21, srli, 0x7fffc000, 0xffff8000, 1 ); #------------------------------------------------------------- # Bypassing tests #------------------------------------------------------------- - TEST_IMM_DEST_BYPASS( 18, 0, srli, 0xff000000, 0x80000000, 7 ); - TEST_IMM_DEST_BYPASS( 19, 1, srli, 0xfffe0000, 0x80000000, 14 ); - TEST_IMM_DEST_BYPASS( 20, 2, srli, 0xffffffff, 0x80000001, 31 ); - - TEST_IMM_SRC1_BYPASS( 21, 0, srli, 0xff000000, 0x80000000, 7 ); - TEST_IMM_SRC1_BYPASS( 22, 1, srli, 0xfffe0000, 0x80000000, 14 ); - TEST_IMM_SRC1_BYPASS( 23, 2, srli, 0xffffffff, 0x80000001, 31 ); - - TEST_IMM_ZEROSRC1( 24, srli, 0, 32 ); - TEST_IMM_ZERODEST( 25, srli, 33, 50 ); + TEST_IMM_DEST_BYPASS( 22, 0, srl, 0x7fffc000, 0xffff8000, 1 ); + TEST_IMM_DEST_BYPASS( 23, 1, srl, 0x0003fffe, 0xffff8000, 14 ); + TEST_IMM_DEST_BYPASS( 24, 2, srl, 0x0001ffff, 0xffff8000, 15 ); + + TEST_IMM_SRC1_BYPASS( 25, 0, srl, 0x7fffc000, 0xffff8000, 1 ); + TEST_IMM_SRC1_BYPASS( 26, 1, srl, 0x0003fffe, 0xffff8000, 14 ); + TEST_IMM_SRC1_BYPASS( 27, 2, srl, 0x0001ffff, 0xffff8000, 15 ); + + + TEST_IMM_ZEROSRC1( 28, srli, 0, 31 ); + TEST_IMM_ZERODEST( 29, srli, 33, 20 ); TEST_PASSFAIL |