Skip to content

Commit

Permalink
target/loongarch: Implement xvbitsel xvset
Browse files Browse the repository at this point in the history 
This patch includes:
- XVBITSEL.V;
- XVBITSELI.B;
- XVSET{EQZ/NEZ}.V;
- XVSETANYEQZ.{B/H/W/D};
- XVSETALLNEZ.{B/H/W/D}.

Signed-off-by: Song Gao <gaosong@loongson.cn>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230914022645.1151356-51-gaosong@loongson.cn>
  • Loading branch information
@gaosong-loongson
gaosong-loongson committed Sep 20, 2023
1 parent 3eeda5f commit f3dfcc8
Show file tree
Hide file tree
Showing 5 changed files with 147 additions and 44 deletions.
19 changes: 19 additions & 0 deletions target/loongarch/disas.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1703,6 +1703,11 @@ static bool trans_##insn(DisasContext *ctx, arg_##type * a) \
return true; \
}

static void output_cv_x(DisasContext *ctx, arg_cv *a, const char *mnemonic)
{
output(ctx, mnemonic, "fcc%d, x%d", a->cd, a->vj);
}

static void output_v_i_x(DisasContext *ctx, arg_v_i *a, const char *mnemonic)
{
output(ctx, mnemonic, "x%d, 0x%x", a->vd, a->imm);
Expand Down Expand Up @@ -2478,6 +2483,20 @@ static bool trans_xvfcmp_cond_##suffix(DisasContext *ctx, \
LASX_FCMP_INSN(s)
LASX_FCMP_INSN(d)

INSN_LASX(xvbitsel_v, vvvv)
INSN_LASX(xvbitseli_b, vv_i)

INSN_LASX(xvseteqz_v, cv)
INSN_LASX(xvsetnez_v, cv)
INSN_LASX(xvsetanyeqz_b, cv)
INSN_LASX(xvsetanyeqz_h, cv)
INSN_LASX(xvsetanyeqz_w, cv)
INSN_LASX(xvsetanyeqz_d, cv)
INSN_LASX(xvsetallnez_b, cv)
INSN_LASX(xvsetallnez_h, cv)
INSN_LASX(xvsetallnez_w, cv)
INSN_LASX(xvsetallnez_d, cv)

INSN_LASX(xvreplgr2vr_b, vr)
INSN_LASX(xvreplgr2vr_h, vr)
INSN_LASX(xvreplgr2vr_w, vr)
Expand Down
16 changes: 8 additions & 8 deletions target/loongarch/helper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -659,14 +659,14 @@ DEF_HELPER_6(vfcmp_s_d, void, env, i32, i32, i32, i32, i32)

DEF_HELPER_FLAGS_4(vbitseli_b, TCG_CALL_NO_RWG, void, ptr, ptr, i64, i32)

DEF_HELPER_3(vsetanyeqz_b, void, env, i32, i32)
DEF_HELPER_3(vsetanyeqz_h, void, env, i32, i32)
DEF_HELPER_3(vsetanyeqz_w, void, env, i32, i32)
DEF_HELPER_3(vsetanyeqz_d, void, env, i32, i32)
DEF_HELPER_3(vsetallnez_b, void, env, i32, i32)
DEF_HELPER_3(vsetallnez_h, void, env, i32, i32)
DEF_HELPER_3(vsetallnez_w, void, env, i32, i32)
DEF_HELPER_3(vsetallnez_d, void, env, i32, i32)
DEF_HELPER_4(vsetanyeqz_b, void, env, i32, i32, i32)
DEF_HELPER_4(vsetanyeqz_h, void, env, i32, i32, i32)
DEF_HELPER_4(vsetanyeqz_w, void, env, i32, i32, i32)
DEF_HELPER_4(vsetanyeqz_d, void, env, i32, i32, i32)
DEF_HELPER_4(vsetallnez_b, void, env, i32, i32, i32)
DEF_HELPER_4(vsetallnez_h, void, env, i32, i32, i32)
DEF_HELPER_4(vsetallnez_w, void, env, i32, i32, i32)
DEF_HELPER_4(vsetallnez_d, void, env, i32, i32, i32)

DEF_HELPER_FLAGS_4(vpackev_b, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)
DEF_HELPER_FLAGS_4(vpackev_h, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, i32)
Expand Down
99 changes: 78 additions & 21 deletions target/loongarch/insn_trans/trans_vec.c.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,20 +202,33 @@ static bool gen_xx_i(DisasContext *ctx, arg_vv_i *a, gen_helper_gvec_2i *fn)
return gen_vv_i_vl(ctx, a, 32, fn);
}

static bool gen_cv(DisasContext *ctx, arg_cv *a,
void (*func)(TCGv_ptr, TCGv_i32, TCGv_i32))
static bool gen_cv_vl(DisasContext *ctx, arg_cv *a, uint32_t sz,
void (*func)(TCGv_ptr, TCGv_i32, TCGv_i32, TCGv_i32))
{
TCGv_i32 vj = tcg_constant_i32(a->vj);
TCGv_i32 cd = tcg_constant_i32(a->cd);

if (!check_vec(ctx, 16)) {
if (!check_vec(ctx, sz)) {
return true;
}

func(cpu_env, cd, vj);
TCGv_i32 vj = tcg_constant_i32(a->vj);
TCGv_i32 cd = tcg_constant_i32(a->cd);
TCGv_i32 oprsz = tcg_constant_i32(sz);

func(cpu_env, oprsz, cd, vj);
return true;
}

static bool gen_cv(DisasContext *ctx, arg_cv *a,
void (*func)(TCGv_ptr, TCGv_i32, TCGv_i32, TCGv_i32))
{
return gen_cv_vl(ctx, a, 16, func);
}

static bool gen_cx(DisasContext *ctx, arg_cv *a,
void (*func)(TCGv_ptr, TCGv_i32, TCGv_i32, TCGv_i32))
{
return gen_cv_vl(ctx, a, 32, func);
}

static bool gvec_vvv_vl(DisasContext *ctx, arg_vvv *a,
uint32_t oprsz, MemOp mop,
void (*func)(unsigned, uint32_t, uint32_t,
Expand Down Expand Up @@ -4690,28 +4703,27 @@ TRANS(vfcmp_cond_d, LSX, do_vfcmp_cond_d, 16)
TRANS(xvfcmp_cond_s, LASX, do_vfcmp_cond_s, 32)
TRANS(xvfcmp_cond_d, LASX, do_vfcmp_cond_d, 32)

static bool trans_vbitsel_v(DisasContext *ctx, arg_vvvv *a)
static bool do_vbitsel_v(DisasContext *ctx, arg_vvvv *a, uint32_t oprsz)
{
if (!avail_LSX(ctx)) {
return false;
}

if (!check_vec(ctx, 16)) {
if (!check_vec(ctx, oprsz)) {
return true;
}

tcg_gen_gvec_bitsel(MO_64, vec_full_offset(a->vd), vec_full_offset(a->va),
vec_full_offset(a->vk), vec_full_offset(a->vj),
16, ctx->vl/8);
oprsz, ctx->vl / 8);
return true;
}

TRANS(vbitsel_v, LSX, do_vbitsel_v, 16)
TRANS(xvbitsel_v, LASX, do_vbitsel_v, 32)

static void gen_vbitseli(unsigned vece, TCGv_vec a, TCGv_vec b, int64_t imm)
{
tcg_gen_bitsel_vec(vece, a, a, tcg_constant_vec_matching(a, vece, imm), b);
}

static bool trans_vbitseli_b(DisasContext *ctx, arg_vv_i *a)
static bool do_vbitseli_b(DisasContext *ctx, arg_vv_i *a, uint32_t oprsz)
{
static const GVecGen2i op = {
.fniv = gen_vbitseli,
Expand All @@ -4720,19 +4732,18 @@ static bool trans_vbitseli_b(DisasContext *ctx, arg_vv_i *a)
.load_dest = true
};

if (!avail_LSX(ctx)) {
return false;
}

if (!check_vec(ctx, 16)) {
if (!check_vec(ctx, oprsz)) {
return true;
}

tcg_gen_gvec_2i(vec_full_offset(a->vd), vec_full_offset(a->vj),
16, ctx->vl/8, a->imm, &op);
oprsz, ctx->vl / 8, a->imm , &op);
return true;
}

TRANS(vbitseli_b, LSX, do_vbitseli_b, 16)
TRANS(xvbitseli_b, LASX, do_vbitseli_b, 32)

#define VSET(NAME, COND) \
static bool trans_## NAME (DisasContext *ctx, arg_cv *a) \
{ \
Expand Down Expand Up @@ -4772,6 +4783,52 @@ TRANS(vsetallnez_h, LSX, gen_cv, gen_helper_vsetallnez_h)
TRANS(vsetallnez_w, LSX, gen_cv, gen_helper_vsetallnez_w)
TRANS(vsetallnez_d, LSX, gen_cv, gen_helper_vsetallnez_d)

#define XVSET(NAME, COND) \
static bool trans_## NAME(DisasContext *ctx, arg_cv * a) \
{ \
TCGv_i64 t1, t2, d[4]; \
\
d[0] = tcg_temp_new_i64(); \
d[1] = tcg_temp_new_i64(); \
d[2] = tcg_temp_new_i64(); \
d[3] = tcg_temp_new_i64(); \
t1 = tcg_temp_new_i64(); \
t2 = tcg_temp_new_i64(); \
\
get_vreg64(d[0], a->vj, 0); \
get_vreg64(d[1], a->vj, 1); \
get_vreg64(d[2], a->vj, 2); \
get_vreg64(d[3], a->vj, 3); \
\
if (!avail_LASX(ctx)) { \
return false; \
} \
\
if (!check_vec(ctx, 32)) { \
return true; \
} \
\
tcg_gen_or_i64(t1, d[0], d[1]); \
tcg_gen_or_i64(t2, d[2], d[3]); \
tcg_gen_or_i64(t1, t2, t1); \
tcg_gen_setcondi_i64(COND, t1, t1, 0); \
tcg_gen_st8_tl(t1, cpu_env, offsetof(CPULoongArchState, cf[a->cd & 0x7])); \
\
return true; \
}

XVSET(xvseteqz_v, TCG_COND_EQ)
XVSET(xvsetnez_v, TCG_COND_NE)

TRANS(xvsetanyeqz_b, LASX, gen_cx, gen_helper_vsetanyeqz_b)
TRANS(xvsetanyeqz_h, LASX, gen_cx, gen_helper_vsetanyeqz_h)
TRANS(xvsetanyeqz_w, LASX, gen_cx, gen_helper_vsetanyeqz_w)
TRANS(xvsetanyeqz_d, LASX, gen_cx, gen_helper_vsetanyeqz_d)
TRANS(xvsetallnez_b, LASX, gen_cx, gen_helper_vsetallnez_b)
TRANS(xvsetallnez_h, LASX, gen_cx, gen_helper_vsetallnez_h)
TRANS(xvsetallnez_w, LASX, gen_cx, gen_helper_vsetallnez_w)
TRANS(xvsetallnez_d, LASX, gen_cx, gen_helper_vsetallnez_d)

static bool trans_vinsgr2vr_b(DisasContext *ctx, arg_vr_i *a)
{
TCGv src = gpr_src(ctx, a->rj, EXT_NONE);
Expand Down
15 changes: 15 additions & 0 deletions target/loongarch/insns.decode
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1961,6 +1961,21 @@ xvslti_du 0111 01101000 10011 ..... ..... ..... @vv_ui5
xvfcmp_cond_s 0000 11001001 ..... ..... ..... ..... @vvv_fcond
xvfcmp_cond_d 0000 11001010 ..... ..... ..... ..... @vvv_fcond

xvbitsel_v 0000 11010010 ..... ..... ..... ..... @vvvv

xvbitseli_b 0111 01111100 01 ........ ..... ..... @vv_ui8

xvseteqz_v 0111 01101001 11001 00110 ..... 00 ... @cv
xvsetnez_v 0111 01101001 11001 00111 ..... 00 ... @cv
xvsetanyeqz_b 0111 01101001 11001 01000 ..... 00 ... @cv
xvsetanyeqz_h 0111 01101001 11001 01001 ..... 00 ... @cv
xvsetanyeqz_w 0111 01101001 11001 01010 ..... 00 ... @cv
xvsetanyeqz_d 0111 01101001 11001 01011 ..... 00 ... @cv
xvsetallnez_b 0111 01101001 11001 01100 ..... 00 ... @cv
xvsetallnez_h 0111 01101001 11001 01101 ..... 00 ... @cv
xvsetallnez_w 0111 01101001 11001 01110 ..... 00 ... @cv
xvsetallnez_d 0111 01101001 11001 01111 ..... 00 ... @cv

xvreplgr2vr_b 0111 01101001 11110 00000 ..... ..... @vr
xvreplgr2vr_h 0111 01101001 11110 00001 ..... ..... @vr
xvreplgr2vr_w 0111 01101001 11110 00010 ..... ..... @vr
Expand Down
42 changes: 27 additions & 15 deletions target/loongarch/vec_helper.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3146,21 +3146,21 @@ VFCMP(vfcmp_s_s, 32, UW, float32_compare)
VFCMP(vfcmp_c_d, 64, UD, float64_compare_quiet)
VFCMP(vfcmp_s_d, 64, UD, float64_compare)

void HELPER(vbitseli_b)(void *vd, void *vj, uint64_t imm, uint32_t v)
void HELPER(vbitseli_b)(void *vd, void *vj, uint64_t imm, uint32_t desc)
{
int i;
VReg *Vd = (VReg *)vd;
VReg *Vj = (VReg *)vj;

for (i = 0; i < 16; i++) {
for (i = 0; i < simd_oprsz(desc); i++) {
Vd->B(i) = (~Vd->B(i) & Vj->B(i)) | (Vd->B(i) & imm);
}
}

/* Copy from target/arm/tcg/sve_helper.c */
static inline bool do_match2(uint64_t n, uint64_t m0, uint64_t m1, int esz)
{
uint64_t bits = 8 << esz;
int bits = 8 << esz;
uint64_t ones = dup_const(esz, 1);
uint64_t signs = ones << (bits - 1);
uint64_t cmp0, cmp1;
Expand All @@ -3173,25 +3173,37 @@ static inline bool do_match2(uint64_t n, uint64_t m0, uint64_t m1, int esz)
return (cmp0 | cmp1) & signs;
}

#define SETANYEQZ(NAME, MO) \
void HELPER(NAME)(CPULoongArchState *env, uint32_t cd, uint32_t vj) \
{ \
VReg *Vj = &(env->fpr[vj].vreg); \
\
env->cf[cd & 0x7] = do_match2(0, Vj->D(0), Vj->D(1), MO); \
#define SETANYEQZ(NAME, MO) \
void HELPER(NAME)(CPULoongArchState *env, \
uint32_t oprsz, uint32_t cd, uint32_t vj) \
{ \
VReg *Vj = &(env->fpr[vj].vreg); \
\
env->cf[cd & 0x7] = do_match2(0, Vj->D(0), Vj->D(1), MO); \
if (oprsz == 32) { \
env->cf[cd & 0x7] = env->cf[cd & 0x7] || \
do_match2(0, Vj->D(2), Vj->D(3), MO); \
} \
}

SETANYEQZ(vsetanyeqz_b, MO_8)
SETANYEQZ(vsetanyeqz_h, MO_16)
SETANYEQZ(vsetanyeqz_w, MO_32)
SETANYEQZ(vsetanyeqz_d, MO_64)

#define SETALLNEZ(NAME, MO) \
void HELPER(NAME)(CPULoongArchState *env, uint32_t cd, uint32_t vj) \
{ \
VReg *Vj = &(env->fpr[vj].vreg); \
\
env->cf[cd & 0x7]= !do_match2(0, Vj->D(0), Vj->D(1), MO); \
#define SETALLNEZ(NAME, MO) \
void HELPER(NAME)(CPULoongArchState *env, \
uint32_t oprsz, uint32_t cd, uint32_t vj) \
{ \
VReg *Vj = &(env->fpr[vj].vreg); \
\
env->cf[cd & 0x7]= !do_match2(0, Vj->D(0), Vj->D(1), MO); \
if (oprsz == 32) { \
env->cf[cd & 0x7] = env->cf[cd & 0x7] && \
!do_match2(0, Vj->D(2), Vj->D(3), MO); \
} \
}

SETALLNEZ(vsetallnez_b, MO_8)
SETALLNEZ(vsetallnez_h, MO_16)
SETALLNEZ(vsetallnez_w, MO_32)
Expand Down

0 comments on commit f3dfcc8

Please sign in to comment.