Signed-off-by: LIU Zhiwei <zhiwei_...@c-sky.com> --- target/riscv/helper.h | 9 ++ target/riscv/insn32-64.decode | 15 ++++ target/riscv/insn_trans/trans_rvp.c.inc | 16 ++++ target/riscv/packed_helper.c | 104 ++++++++++++++++++++++++ 4 files changed, 144 insertions(+)
diff --git a/target/riscv/helper.h b/target/riscv/helper.h index 0ade207de6..673bc4f628 100644 --- a/target/riscv/helper.h +++ b/target/riscv/helper.h @@ -1425,4 +1425,13 @@ DEF_HELPER_3(rstsa32, tl, env, tl, tl) DEF_HELPER_3(urstsa32, tl, env, tl, tl) DEF_HELPER_3(kstsa32, tl, env, tl, tl) DEF_HELPER_3(ukstsa32, tl, env, tl, tl) + +DEF_HELPER_3(sra32, tl, env, tl, tl) +DEF_HELPER_3(sra32_u, tl, env, tl, tl) +DEF_HELPER_3(srl32, tl, env, tl, tl) +DEF_HELPER_3(srl32_u, tl, env, tl, tl) +DEF_HELPER_3(sll32, tl, env, tl, tl) +DEF_HELPER_3(ksll32, tl, env, tl, tl) +DEF_HELPER_3(kslra32, tl, env, tl, tl) +DEF_HELPER_3(kslra32_u, tl, env, tl, tl) #endif diff --git a/target/riscv/insn32-64.decode b/target/riscv/insn32-64.decode index 66eec1a44a..6f0f2923ca 100644 --- a/target/riscv/insn32-64.decode +++ b/target/riscv/insn32-64.decode @@ -114,3 +114,18 @@ rstsa32 1011001 ..... ..... 010 ..... 1111111 @r urstsa32 1101001 ..... ..... 010 ..... 1111111 @r kstsa32 1100001 ..... ..... 010 ..... 1111111 @r ukstsa32 1110001 ..... ..... 010 ..... 1111111 @r + +sra32 0101000 ..... ..... 010 ..... 1111111 @r +sra32_u 0110000 ..... ..... 010 ..... 1111111 @r +srai32 0111000 ..... ..... 010 ..... 1111111 @sh5 +srai32_u 1000000 ..... ..... 010 ..... 1111111 @sh5 +srl32 0101001 ..... ..... 010 ..... 1111111 @r +srl32_u 0110001 ..... ..... 010 ..... 1111111 @r +srli32 0111001 ..... ..... 010 ..... 1111111 @sh5 +srli32_u 1000001 ..... ..... 010 ..... 1111111 @sh5 +sll32 0101010 ..... ..... 010 ..... 1111111 @r +slli32 0111010 ..... ..... 010 ..... 1111111 @sh5 +ksll32 0110010 ..... ..... 010 ..... 1111111 @r +kslli32 1000010 ..... ..... 010 ..... 1111111 @sh5 +kslra32 0101011 ..... ..... 010 ..... 1111111 @r +kslra32_u 0110011 ..... ..... 010 ..... 1111111 @r diff --git a/target/riscv/insn_trans/trans_rvp.c.inc b/target/riscv/insn_trans/trans_rvp.c.inc index ea673b3aca..e52f268a57 100644 --- a/target/riscv/insn_trans/trans_rvp.c.inc +++ b/target/riscv/insn_trans/trans_rvp.c.inc @@ -1156,4 +1156,20 @@ GEN_RVP_R_OOL(rstsa32); GEN_RVP_R_OOL(urstsa32); GEN_RVP_R_OOL(kstsa32); GEN_RVP_R_OOL(ukstsa32); + +/* (RV64 Only) SIMD 32-bit Shift Instructions */ +GEN_RVP_SHIFT(sra32, tcg_gen_gvec_sars, 2); +GEN_RVP_SHIFTI(srai32, sra32, NULL); +GEN_RVP_R_OOL(sra32_u); +GEN_RVP_SHIFTI(srai32_u, sra32_u, NULL); +GEN_RVP_SHIFT(srl32, tcg_gen_gvec_shrs, 2); +GEN_RVP_SHIFTI(srli32, srl32, NULL); +GEN_RVP_R_OOL(srl32_u); +GEN_RVP_SHIFTI(srli32_u, srl32_u, NULL); +GEN_RVP_SHIFT(sll32, tcg_gen_gvec_shls, 2); +GEN_RVP_SHIFTI(slli32, sll32, NULL); +GEN_RVP_R_OOL(ksll32); +GEN_RVP_SHIFTI(kslli32, ksll32, NULL); +GEN_RVP_R_OOL(kslra32); +GEN_RVP_R_OOL(kslra32_u); #endif diff --git a/target/riscv/packed_helper.c b/target/riscv/packed_helper.c index bb56933c39..c168c51eff 100644 --- a/target/riscv/packed_helper.c +++ b/target/riscv/packed_helper.c @@ -3273,4 +3273,108 @@ static inline void do_ukstsa32(CPURISCVState *env, void *vd, void *va, } RVPR(ukstsa32, 2, 4); + +/* (RV64 Only) SIMD 32-bit Shift Instructions */ +static inline void do_sra32(CPURISCVState *env, void *vd, void *va, + void *vb, uint8_t i) +{ + int32_t *d = vd, *a = va; + uint8_t shift = *(uint8_t *)vb & 0x1f; + d[i] = a[i] >> shift; +} + +RVPR(sra32, 1, 4); + +static inline void do_srl32(CPURISCVState *env, void *vd, void *va, + void *vb, uint8_t i) +{ + uint32_t *d = vd, *a = va; + uint8_t shift = *(uint8_t *)vb & 0x1f; + d[i] = a[i] >> shift; +} + +RVPR(srl32, 1, 4); + +static inline void do_sll32(CPURISCVState *env, void *vd, void *va, + void *vb, uint8_t i) +{ + uint32_t *d = vd, *a = va; + uint8_t shift = *(uint8_t *)vb & 0x1f; + d[i] = a[i] << shift; +} + +RVPR(sll32, 1, 4); + +static inline void do_sra32_u(CPURISCVState *env, void *vd, void *va, + void *vb, uint8_t i) +{ + int32_t *d = vd, *a = va; + uint8_t shift = *(uint8_t *)vb & 0x1f; + + d[i] = vssra32(env, 0, a[i], shift); +} + +RVPR(sra32_u, 1, 4); + +static inline void do_srl32_u(CPURISCVState *env, void *vd, void *va, + void *vb, uint8_t i) +{ + uint32_t *d = vd, *a = va; + uint8_t shift = *(uint8_t *)vb & 0x1f; + + d[i] = vssrl32(env, 0, a[i], shift); +} + +RVPR(srl32_u, 1, 4); + +static inline void do_ksll32(CPURISCVState *env, void *vd, void *va, + void *vb, uint8_t i) +{ + int32_t *d = vd, *a = va, result; + uint8_t shift = *(uint8_t *)vb & 0x1f; + + result = a[i] << shift; + if (shift > clrsb32(a[i])) { + env->vxsat = 0x1; + d[i] = (a[i] & INT32_MIN) ? INT32_MIN : INT32_MAX; + } else { + d[i] = result; + } +} + +RVPR(ksll32, 1, 4); + +static inline void do_kslra32(CPURISCVState *env, void *vd, void *va, + void *vb, uint8_t i) +{ + uint32_t *d = vd, *a = va; + int32_t shift = sextract32((*(uint32_t *)vb), 0, 6); + + if (shift >= 0) { + do_ksll32(env, vd, va, vb, i); + } else { + shift = -shift; + shift = (shift == 32) ? 31 : shift; + d[i] = a[i] >> shift; + } +} + +RVPR(kslra32, 1, 4); + +static inline void do_kslra32_u(CPURISCVState *env, void *vd, void *va, + void *vb, uint8_t i) +{ + uint32_t *d = vd, *a = va; + int32_t shift = sextract32((*(uint32_t *)vb), 0, 6); + + if (shift >= 0) { + do_ksll32(env, vd, va, vb, i); + } else { + shift = -shift; + shift = (shift == 32) ? 31 : shift; + d[i] = vssra32(env, 0, a[i], shift); + } +} + +RVPR(kslra32_u, 1, 4); #endif -- 2.17.1