Commit 78d90cfe authored by LIU Zhiwei's avatar LIU Zhiwei Committed by Alistair Francis
Browse files

target/riscv: vector iota instruction 



Signed-off-by: default avatarLIU Zhiwei <zhiwei_liu@c-sky.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-Id: <20200701152549.1218-54-zhiwei_liu@c-sky.com>
Signed-off-by: default avatarAlistair Francis <alistair.francis@wdc.com>
parent 81fbf7da

target/riscv/helper.h

+5 −0
Original line number Diff line number Diff line
@@ -1109,3 +1109,8 @@ DEF_HELPER_4(vmfirst_m, tl, ptr, ptr, env, i32) 
DEF_HELPER_5(vmsbf_m, void, ptr, ptr, ptr, env, i32)

DEF_HELPER_5(vmsif_m, void, ptr, ptr, ptr, env, i32)

DEF_HELPER_5(vmsof_m, void, ptr, ptr, ptr, env, i32)



DEF_HELPER_5(viota_m_b, void, ptr, ptr, ptr, env, i32)

DEF_HELPER_5(viota_m_h, void, ptr, ptr, ptr, env, i32)

DEF_HELPER_5(viota_m_w, void, ptr, ptr, ptr, env, i32)

DEF_HELPER_5(viota_m_d, void, ptr, ptr, ptr, env, i32)

target/riscv/insn32.decode

+1 −0
Original line number Diff line number Diff line
@@ -560,6 +560,7 @@ vmfirst_m 010101 . ..... ----- 010 ..... 1010111 @r2_vm 
vmsbf_m         010110 . ..... 00001 010 ..... 1010111 @r2_vm

vmsif_m         010110 . ..... 00011 010 ..... 1010111 @r2_vm

vmsof_m         010110 . ..... 00010 010 ..... 1010111 @r2_vm

viota_m         010110 . ..... 10000 010 ..... 1010111 @r2_vm



vsetvli         0 ........... ..... 111 ..... 1010111  @r2_zimm

vsetvl          1000000 ..... ..... 111 ..... 1010111  @r

target/riscv/insn_trans/trans_rvv.inc.c

+27 −0
Original line number Diff line number Diff line
@@ -2481,3 +2481,30 @@ static bool trans_##NAME(DisasContext *s, arg_rmr *a) \ 
GEN_M_TRANS(vmsbf_m)

GEN_M_TRANS(vmsif_m)

GEN_M_TRANS(vmsof_m)



/* Vector Iota Instruction */

static bool trans_viota_m(DisasContext *s, arg_viota_m *a)

{

    if (vext_check_isa_ill(s) &&

        vext_check_reg(s, a->rd, false) &&

        vext_check_overlap_group(a->rd, 1 << s->lmul, a->rs2, 1) &&

        (a->vm != 0 || a->rd != 0)) {

        uint32_t data = 0;

        TCGLabel *over = gen_new_label();

        tcg_gen_brcondi_tl(TCG_COND_EQ, cpu_vl, 0, over);



        data = FIELD_DP32(data, VDATA, MLEN, s->mlen);

        data = FIELD_DP32(data, VDATA, VM, a->vm);

        data = FIELD_DP32(data, VDATA, LMUL, s->lmul);

        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,

        };

        tcg_gen_gvec_3_ptr(vreg_ofs(s, a->rd), vreg_ofs(s, 0),

                           vreg_ofs(s, a->rs2), cpu_env, 0,

                           s->vlen / 8, data, fns[s->sew]);

        gen_set_label(over);

        return true;

    }

    return false;

}

target/riscv/vector_helper.c

+29 −0
Original line number Diff line number Diff line
@@ -4644,3 +4644,32 @@ void HELPER(vmsof_m)(void *vd, void *v0, void *vs2, CPURISCVState *env, 
{

    vmsetm(vd, v0, vs2, env, desc, ONLY_FIRST);

}



/* Vector Iota Instruction */

#define GEN_VEXT_VIOTA_M(NAME, ETYPE, H, CLEAR_FN)                        \

void HELPER(NAME)(void *vd, void *v0, void *vs2, CPURISCVState *env,      \

                  uint32_t desc)                                          \

{                                                                         \

    uint32_t mlen = vext_mlen(desc);                                      \

    uint32_t vlmax = env_archcpu(env)->cfg.vlen / mlen;                   \

    uint32_t vm = vext_vm(desc);                                          \

    uint32_t vl = env->vl;                                                \

    uint32_t sum = 0;                                                     \

    int i;                                                                \

                                                                          \

    for (i = 0; i < vl; i++) {                                            \

        if (!vm && !vext_elem_mask(v0, mlen, i)) {                        \

            continue;                                                     \

        }                                                                 \

        *((ETYPE *)vd + H(i)) = sum;                                      \

        if (vext_elem_mask(vs2, mlen, i)) {                               \

            sum++;                                                        \

        }                                                                 \

    }                                                                     \

    CLEAR_FN(vd, vl, vl * sizeof(ETYPE), vlmax * sizeof(ETYPE));          \

}



GEN_VEXT_VIOTA_M(viota_m_b, uint8_t, H1, clearb)

GEN_VEXT_VIOTA_M(viota_m_h, uint16_t, H2, clearh)

GEN_VEXT_VIOTA_M(viota_m_w, uint32_t, H4, clearl)

GEN_VEXT_VIOTA_M(viota_m_d, uint64_t, H8, clearq)