1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192 |
- From 0c65425aa1d9040a0f65452ecf80f86f2f0889da Mon Sep 17 00:00:00 2001
- From: Frank Chang <frank.chang@sifive.com>
- Date: Thu, 2 Jul 2020 11:49:38 +0800
- Subject: [PATCH 036/107] target/riscv: rvv-1.0: mask population count
- instruction
- Signed-off-by: Frank Chang <frank.chang@sifive.com>
- Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
- ---
- target/riscv/helper.h | 2 +-
- target/riscv/insn32.decode | 2 +-
- target/riscv/insn_trans/trans_rvv.c.inc | 7 ++++---
- target/riscv/vector_helper.c | 6 +++---
- 4 files changed, 9 insertions(+), 8 deletions(-)
- diff --git a/target/riscv/helper.h b/target/riscv/helper.h
- index f35cd987ee..741f69dc44 100644
- --- a/target/riscv/helper.h
- +++ b/target/riscv/helper.h
- @@ -1095,7 +1095,7 @@ DEF_HELPER_6(vmnor_mm, void, ptr, ptr, ptr, ptr, env, i32)
- DEF_HELPER_6(vmornot_mm, void, ptr, ptr, ptr, ptr, env, i32)
- DEF_HELPER_6(vmxnor_mm, void, ptr, ptr, ptr, ptr, env, i32)
-
- -DEF_HELPER_4(vmpopc_m, tl, ptr, ptr, env, i32)
- +DEF_HELPER_4(vpopc_m, tl, ptr, ptr, env, i32)
-
- DEF_HELPER_4(vmfirst_m, tl, ptr, ptr, env, i32)
-
- diff --git a/target/riscv/insn32.decode b/target/riscv/insn32.decode
- index ac04311bca..618ddf963c 100644
- --- a/target/riscv/insn32.decode
- +++ b/target/riscv/insn32.decode
- @@ -602,7 +602,7 @@ vmor_mm 011010 - ..... ..... 010 ..... 1010111 @r
- vmnor_mm 011110 - ..... ..... 010 ..... 1010111 @r
- vmornot_mm 011100 - ..... ..... 010 ..... 1010111 @r
- vmxnor_mm 011111 - ..... ..... 010 ..... 1010111 @r
- -vmpopc_m 010100 . ..... ----- 010 ..... 1010111 @r2_vm
- +vpopc_m 010000 . ..... 10000 010 ..... 1010111 @r2_vm
- vmfirst_m 010101 . ..... ----- 010 ..... 1010111 @r2_vm
- vmsbf_m 010110 . ..... 00001 010 ..... 1010111 @r2_vm
- vmsif_m 010110 . ..... 00011 010 ..... 1010111 @r2_vm
- diff --git a/target/riscv/insn_trans/trans_rvv.c.inc b/target/riscv/insn_trans/trans_rvv.c.inc
- index 71f2343d4d..57ef3ed183 100644
- --- a/target/riscv/insn_trans/trans_rvv.c.inc
- +++ b/target/riscv/insn_trans/trans_rvv.c.inc
- @@ -2893,8 +2893,8 @@ GEN_MM_TRANS(vmnor_mm)
- GEN_MM_TRANS(vmornot_mm)
- GEN_MM_TRANS(vmxnor_mm)
-
- -/* Vector mask population count vmpopc */
- -static bool trans_vmpopc_m(DisasContext *s, arg_rmr *a)
- +/* Vector mask population count vpopc */
- +static bool trans_vpopc_m(DisasContext *s, arg_rmr *a)
- {
- if (require_rvv(s) &&
- vext_check_isa_ill(s)) {
- @@ -2913,13 +2913,14 @@ static bool trans_vmpopc_m(DisasContext *s, arg_rmr *a)
- tcg_gen_addi_ptr(src2, cpu_env, vreg_ofs(s, a->rs2));
- tcg_gen_addi_ptr(mask, cpu_env, vreg_ofs(s, 0));
-
- - gen_helper_vmpopc_m(dst, mask, src2, cpu_env, desc);
- + gen_helper_vpopc_m(dst, mask, src2, cpu_env, desc);
- gen_set_gpr(a->rd, dst);
-
- tcg_temp_free_ptr(mask);
- tcg_temp_free_ptr(src2);
- tcg_temp_free(dst);
- tcg_temp_free_i32(desc);
- +
- return true;
- }
- return false;
- diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c
- index 0a9fb898a1..cc76b60470 100644
- --- a/target/riscv/vector_helper.c
- +++ b/target/riscv/vector_helper.c
- @@ -4420,9 +4420,9 @@ GEN_VEXT_MASK_VV(vmnor_mm, DO_NOR)
- GEN_VEXT_MASK_VV(vmornot_mm, DO_ORNOT)
- GEN_VEXT_MASK_VV(vmxnor_mm, DO_XNOR)
-
- -/* Vector mask population count vmpopc */
- -target_ulong HELPER(vmpopc_m)(void *v0, void *vs2, CPURISCVState *env,
- - uint32_t desc)
- +/* Vector mask population count vpopc */
- +target_ulong HELPER(vpopc_m)(void *v0, void *vs2, CPURISCVState *env,
- + uint32_t desc)
- {
- target_ulong cnt = 0;
- uint32_t vm = vext_vm(desc);
- --
- 2.33.1
|