diff options
| author | Andrew Waterman <andrew@sifive.com> | 2025-04-18 16:27:08 -0700 |
|---|---|---|
| committer | Andrew Waterman <andrew@sifive.com> | 2025-04-18 16:27:08 -0700 |
| commit | b6941920e88c5c751b03f9a3b88c01f7309a35af (patch) | |
| tree | fbc2a3c125e375a6aa623d4ae6f29843a312d5db | |
| parent | 4bbcf2e7def4c0b37e893baaa5ddaf31e1144e33 (diff) | |
| download | riscv-tests-b6941920e88c5c751b03f9a3b88c01f7309a35af.zip riscv-tests-b6941920e88c5c751b03f9a3b88c01f7309a35af.tar.gz riscv-tests-b6941920e88c5c751b03f9a3b88c01f7309a35af.tar.bz2 | |
Fix rv32ud-p-fcvt_w and -recoding being redundant with rv32uf
Resolves #614
| -rw-r--r-- | isa/macros/scalar/test_macros.h | 2 | ||||
| -rw-r--r-- | isa/rv32ud/fcvt_w.S | 6 | ||||
| -rw-r--r-- | isa/rv32ud/recoding.S | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/isa/macros/scalar/test_macros.h b/isa/macros/scalar/test_macros.h index a11c36a..542afb0 100644 --- a/isa/macros/scalar/test_macros.h +++ b/isa/macros/scalar/test_macros.h @@ -623,7 +623,7 @@ test_ ## testnum: \ #define TEST_FP_INT_OP_D32( testnum, inst, flags, result, val1, rm ) \ TEST_FP_OP_D32_INTERNAL( testnum, flags, dword result, double val1, double 0, double 0, \ - inst a0, f10, f11; li t2, 0) + inst a0, f10, rm; li t2, ((result) << 32 >> 63) * -1) #define TEST_FP_INT_OP_D( testnum, inst, flags, result, val1, rm ) \ TEST_FP_OP_D_INTERNAL( testnum, flags, dword result, double val1, double 0, double 0, \ diff --git a/isa/rv32ud/fcvt_w.S b/isa/rv32ud/fcvt_w.S index 3447530..5ae07ad 100644 --- a/isa/rv32ud/fcvt_w.S +++ b/isa/rv32ud/fcvt_w.S @@ -4,4 +4,8 @@ #undef RVTEST_RV64UF #define RVTEST_RV64UF RVTEST_RV32UF -#include "../rv64uf/fcvt_w.S" +#include "test_macros.h" +#undef TEST_FP_INT_OP_D +#define TEST_FP_INT_OP_D TEST_FP_INT_OP_D32 + +#include "../rv64ud/fcvt_w.S" diff --git a/isa/rv32ud/recoding.S b/isa/rv32ud/recoding.S index 5dc0113..a926f18 100644 --- a/isa/rv32ud/recoding.S +++ b/isa/rv32ud/recoding.S @@ -4,4 +4,4 @@ #undef RVTEST_RV64UF #define RVTEST_RV64UF RVTEST_RV32UF -#include "../rv64uf/recoding.S" +#include "../rv64ud/recoding.S" |