0056-target-riscv-rvv-1.0-mask-register-logical-instructi.patch 2.6 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152
  1. From 33266e54a9e325764d97200944d68f04a2bdcd07 Mon Sep 17 00:00:00 2001
  2. From: Frank Chang <frank.chang@sifive.com>
  3. Date: Thu, 30 Jul 2020 21:31:27 +0800
  4. Subject: [PATCH 056/107] target/riscv: rvv-1.0: mask-register logical
  5. instructions
  6. Signed-off-by: Frank Chang <frank.chang@sifive.com>
  7. Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
  8. ---
  9. target/riscv/insn_trans/trans_rvv.c.inc | 3 ++-
  10. target/riscv/vector_helper.c | 4 ----
  11. 2 files changed, 2 insertions(+), 5 deletions(-)
  12. diff --git a/target/riscv/insn_trans/trans_rvv.c.inc b/target/riscv/insn_trans/trans_rvv.c.inc
  13. index 5f02399ad3..73537bc3ad 100644
  14. --- a/target/riscv/insn_trans/trans_rvv.c.inc
  15. +++ b/target/riscv/insn_trans/trans_rvv.c.inc
  16. @@ -2881,7 +2881,8 @@ GEN_OPFVV_WIDEN_TRANS(vfwredsum_vs, reduction_check)
  17. #define GEN_MM_TRANS(NAME) \
  18. static bool trans_##NAME(DisasContext *s, arg_r *a) \
  19. { \
  20. - if (vext_check_isa_ill(s)) { \
  21. + if (require_rvv(s) && \
  22. + vext_check_isa_ill(s)) { \
  23. uint32_t data = 0; \
  24. gen_helper_gvec_4_ptr *fn = gen_helper_##NAME; \
  25. TCGLabel *over = gen_new_label(); \
  26. diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c
  27. index ef3875ee7d..6af15eb8f2 100644
  28. --- a/target/riscv/vector_helper.c
  29. +++ b/target/riscv/vector_helper.c
  30. @@ -4440,7 +4440,6 @@ void HELPER(NAME)(void *vd, void *v0, void *vs1, \
  31. void *vs2, CPURISCVState *env, \
  32. uint32_t desc) \
  33. { \
  34. - uint32_t vlmax = env_archcpu(env)->cfg.vlen; \
  35. uint32_t vl = env->vl; \
  36. uint32_t i; \
  37. int a, b; \
  38. @@ -4450,9 +4449,6 @@ void HELPER(NAME)(void *vd, void *v0, void *vs1, \
  39. b = vext_elem_mask(vs2, i); \
  40. vext_set_elem_mask(vd, i, OP(b, a)); \
  41. } \
  42. - for (; i < vlmax; i++) { \
  43. - vext_set_elem_mask(vd, i, 0); \
  44. - } \
  45. }
  46. #define DO_NAND(N, M) (!(N & M))
  47. --
  48. 2.33.1