[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH qemu 8/9] target/riscv: rvv: Add mask agnostic for vector mask in
|
From: |
~eopxd |
|
Subject: |
[PATCH qemu 8/9] target/riscv: rvv: Add mask agnostic for vector mask instructions |
|
Date: |
Mon, 25 Apr 2022 14:18:47 -0000 |
From: Yueh-Ting (eop) Chen <eop.chen@sifive.com>
Signed-off-by: eop Chen <eop.chen@sifive.com>
Reviewed-by: Frank Chang <frank.chang@sifive.com>
---
target/riscv/insn_trans/trans_rvv.c.inc | 3 +++
target/riscv/vector_helper.c | 13 +++++++++++++
2 files changed, 16 insertions(+)
diff --git a/target/riscv/insn_trans/trans_rvv.c.inc
b/target/riscv/insn_trans/trans_rvv.c.inc
index e404d24bcf..69d00c7116 100644
--- a/target/riscv/insn_trans/trans_rvv.c.inc
+++ b/target/riscv/insn_trans/trans_rvv.c.inc
@@ -3333,6 +3333,7 @@ static bool trans_##NAME(DisasContext *s, arg_rmr *a)
\
data = FIELD_DP32(data, VDATA, VM, a->vm); \
data = FIELD_DP32(data, VDATA, LMUL, s->lmul); \
data = FIELD_DP32(data, VDATA, VTA, s->vta); \
+ data = FIELD_DP32(data, VDATA, VMA, s->vma); \
tcg_gen_gvec_3_ptr(vreg_ofs(s, a->rd), \
vreg_ofs(s, 0), vreg_ofs(s, a->rs2), \
cpu_env, s->cfg_ptr->vlen / 8, \
@@ -3371,6 +3372,7 @@ static bool trans_viota_m(DisasContext *s, arg_viota_m *a)
data = FIELD_DP32(data, VDATA, VM, a->vm);
data = FIELD_DP32(data, VDATA, LMUL, s->lmul);
data = FIELD_DP32(data, VDATA, VTA, s->vta);
+ data = FIELD_DP32(data, VDATA, VMA, s->vma);
static gen_helper_gvec_3_ptr * const fns[4] = {
gen_helper_viota_m_b, gen_helper_viota_m_h,
gen_helper_viota_m_w, gen_helper_viota_m_d,
@@ -3401,6 +3403,7 @@ static bool trans_vid_v(DisasContext *s, arg_vid_v *a)
data = FIELD_DP32(data, VDATA, VM, a->vm);
data = FIELD_DP32(data, VDATA, LMUL, s->lmul);
data = FIELD_DP32(data, VDATA, VTA, s->vta);
+ data = FIELD_DP32(data, VDATA, VMA, s->vma);
static gen_helper_gvec_2_ptr * const fns[4] = {
gen_helper_vid_v_b, gen_helper_vid_v_h,
gen_helper_vid_v_w, gen_helper_vid_v_d,
diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c
index 0af65e5423..600ccad513 100644
--- a/target/riscv/vector_helper.c
+++ b/target/riscv/vector_helper.c
@@ -4895,11 +4895,16 @@ static void vmsetm(void *vd, void *v0, void *vs2,
CPURISCVState *env,
uint32_t vl = env->vl;
uint32_t total_elems = env_archcpu(env)->cfg.vlen;
uint32_t vta = vext_vta(desc);
+ uint32_t vma = vext_vma(desc);
int i;
bool first_mask_bit = false;
for (i = env->vstart; i < vl; i++) {
if (!vm && !vext_elem_mask(v0, i)) {
+ /* set masked-off elements to 1s */
+ if (vma) {
+ vext_set_elem_mask(vd, i, 1);
+ }
continue;
}
/* write a zero to all following active elements */
@@ -4959,11 +4964,15 @@ void HELPER(NAME)(void *vd, void *v0, void *vs2,
CPURISCVState *env, \
uint32_t esz = sizeof(ETYPE); \
uint32_t total_elems = vext_get_total_elems(desc, esz); \
uint32_t vta = vext_vta(desc); \
+ uint32_t vma = vext_vma(desc); \
uint32_t sum = 0; \
int i; \
\
for (i = env->vstart; i < vl; i++) { \
if (!vm && !vext_elem_mask(v0, i)) { \
+ /* set masked-off elements to 1s */ \
+ vext_set_elems_1s_fns[ctzl(esz)](vd, vma, i, i * esz, \
+ (i + 1) * esz); \
continue; \
} \
*((ETYPE *)vd + H(i)) = sum; \
@@ -4991,10 +5000,14 @@ void HELPER(NAME)(void *vd, void *v0, CPURISCVState
*env, uint32_t desc) \
uint32_t esz = sizeof(ETYPE); \
uint32_t total_elems = vext_get_total_elems(desc, esz); \
uint32_t vta = vext_vta(desc); \
+ uint32_t vma = vext_vma(desc); \
int i; \
\
for (i = env->vstart; i < vl; i++) { \
if (!vm && !vext_elem_mask(v0, i)) { \
+ /* set masked-off elements to 1s */ \
+ vext_set_elems_1s_fns[ctzl(esz)](vd, vma, i, i * esz, \
+ (i + 1) * esz); \
continue; \
} \
*((ETYPE *)vd + H(i)) = i; \
--
2.34.2
- [PATCH qemu 0/9] Add mask agnostic behavior for rvv instructions, ~eopxd, 2022/04/25
- [PATCH qemu 2/9] target/riscv: rvv: Add mask agnostic for vector load / store instructions, ~eopxd, 2022/04/25
- [PATCH qemu 8/9] target/riscv: rvv: Add mask agnostic for vector mask instructions,
~eopxd <=
- [PATCH qemu 1/9] target/riscv: rvv: Add mask agnostic for vv instructions, ~eopxd, 2022/04/25
- Re: [PATCH qemu 1/9] target/riscv: rvv: Add mask agnostic for vv instructions, Weiwei Li, 2022/04/26
- Re: [PATCH qemu 1/9] target/riscv: rvv: Add mask agnostic for vv instructions, eop Chen, 2022/04/26
- Re: [PATCH qemu 1/9] target/riscv: rvv: Add mask agnostic for vv instructions, Weiwei Li, 2022/04/26
- Re: [PATCH qemu 1/9] target/riscv: rvv: Add mask agnostic for vv instructions, eop Chen, 2022/04/26
- Re: [PATCH qemu 1/9] target/riscv: rvv: Add mask agnostic for vv instructions, Weiwei Li, 2022/04/26
- Re: [PATCH qemu 1/9] target/riscv: rvv: Add mask agnostic for vv instructions, eop Chen, 2022/04/26
[PATCH qemu 5/9] target/riscv: rvv: Add mask agnostic for vector integer comparison instructions, ~eopxd, 2022/04/25
[PATCH qemu 9/9] target/riscv: rvv: Add mask agnostic for vector permutation instructions, ~eopxd, 2022/04/25
[PATCH qemu 4/9] target/riscv: rvv: Add mask agnostic for vector integer shift instructions, ~eopxd, 2022/04/25