yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-23 00:05:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcg/aarch64: Fix generation of scalar vector operations

Browse source 
For some vector operations, "1D" is not a valid type, and there
are separate instructions for the 64-bit scalar operation.

Backports d81bad24dfea6ec0331599de1f31d822aba9dae1
This commit is contained in:
Richard Henderson 2021-03-09 13:22:04 -05:00 committed by Lioncash
parent b01d5a9fdf
commit 6ef897bbad
1 changed files with 176 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

157
qemu/tcg/aarch64/tcg-target.inc.c
View file

@ -512,6 +512,39 @@ typedef enum {
I3606_BIC = 0x2f001400, I3606_BIC = 0x2f001400,
I3606_ORR = 0x0f001400, I3606_ORR = 0x0f001400,
/* AdvSIMD scalar shift by immediate */
I3609_SSHR = 0x5f000400,
I3609_SSRA = 0x5f001400,
I3609_SHL = 0x5f005400,
I3609_USHR = 0x7f000400,
I3609_USRA = 0x7f001400,
I3609_SLI = 0x7f005400,
/* AdvSIMD scalar three same */
I3611_SQADD = 0x5e200c00,
I3611_SQSUB = 0x5e202c00,
I3611_CMGT = 0x5e203400,
I3611_CMGE = 0x5e203c00,
I3611_SSHL = 0x5e204400,
I3611_ADD = 0x5e208400,
I3611_CMTST = 0x5e208c00,
I3611_UQADD = 0x7e200c00,
I3611_UQSUB = 0x7e202c00,
I3611_CMHI = 0x7e203400,
I3611_CMHS = 0x7e203c00,
I3611_USHL = 0x7e204400,
I3611_SUB = 0x7e208400,
I3611_CMEQ = 0x7e208c00,
/* AdvSIMD scalar two-reg misc */
I3612_CMGT0 = 0x5e208800,
I3612_CMEQ0 = 0x5e209800,
I3612_CMLT0 = 0x5e20a800,
I3612_ABS = 0x5e20b800,
I3612_CMGE0 = 0x7e208800,
I3612_CMLE0 = 0x7e209800,
I3612_NEG = 0x7e20b800,
/* AdvSIMD shift by immediate */ /* AdvSIMD shift by immediate */
I3614_SSHR = 0x0f000400, I3614_SSHR = 0x0f000400,
I3614_SSRA = 0x0f001400, I3614_SSRA = 0x0f001400,
@ -727,6 +760,25 @@ static void tcg_out_insn_3606(TCGContext *s, AArch64Insn insn, bool q,
| (imm8 & 0xe0) << (16 - 5) | (imm8 & 0x1f) << 5); | (imm8 & 0xe0) << (16 - 5) | (imm8 & 0x1f) << 5);
} }
static void tcg_out_insn_3609(TCGContext *s, AArch64Insn insn,
TCGReg rd, TCGReg rn, unsigned immhb)
{
tcg_out32(s, insn | immhb << 16 | (rn & 0x1f) << 5 | (rd & 0x1f));
}
static void tcg_out_insn_3611(TCGContext *s, AArch64Insn insn,
unsigned size, TCGReg rd, TCGReg rn, TCGReg rm)
{
tcg_out32(s, insn | (size << 22) | (rm & 0x1f) << 16
| (rn & 0x1f) << 5 | (rd & 0x1f));
}
static void tcg_out_insn_3612(TCGContext *s, AArch64Insn insn,
unsigned size, TCGReg rd, TCGReg rn)
{
tcg_out32(s, insn | (size << 22) | (rn & 0x1f) << 5 | (rd & 0x1f));
}
static void tcg_out_insn_3614(TCGContext *s, AArch64Insn insn, bool q, static void tcg_out_insn_3614(TCGContext *s, AArch64Insn insn, bool q,
TCGReg rd, TCGReg rn, unsigned immhb) TCGReg rd, TCGReg rn, unsigned immhb)
{ {
@ -2233,23 +2285,38 @@ static void tcg_out_vec_op(TCGContext *s, TCGOpcode opc,
unsigned vecl, unsigned vece, unsigned vecl, unsigned vece,
const TCGArg *args, const int *const_args) const TCGArg *args, const int *const_args)
{ {
static const AArch64Insn cmp_insn[16] = { static const AArch64Insn cmp_vec_insn[16] = {
[TCG_COND_EQ] = I3616_CMEQ, [TCG_COND_EQ] = I3616_CMEQ,
[TCG_COND_GT] = I3616_CMGT, [TCG_COND_GT] = I3616_CMGT,
[TCG_COND_GE] = I3616_CMGE, [TCG_COND_GE] = I3616_CMGE,
[TCG_COND_GTU] = I3616_CMHI, [TCG_COND_GTU] = I3616_CMHI,
[TCG_COND_GEU] = I3616_CMHS, [TCG_COND_GEU] = I3616_CMHS,
}; };
static const AArch64Insn cmp0_insn[16] = { static const AArch64Insn cmp_scalar_insn[16] = {
[TCG_COND_EQ] = I3611_CMEQ,
[TCG_COND_GT] = I3611_CMGT,
[TCG_COND_GE] = I3611_CMGE,
[TCG_COND_GTU] = I3611_CMHI,
[TCG_COND_GEU] = I3611_CMHS,
};
static const AArch64Insn cmp0_vec_insn[16] = {
[TCG_COND_EQ] = I3617_CMEQ0, [TCG_COND_EQ] = I3617_CMEQ0,
[TCG_COND_GT] = I3617_CMGT0, [TCG_COND_GT] = I3617_CMGT0,
[TCG_COND_GE] = I3617_CMGE0, [TCG_COND_GE] = I3617_CMGE0,
[TCG_COND_LT] = I3617_CMLT0, [TCG_COND_LT] = I3617_CMLT0,
[TCG_COND_LE] = I3617_CMLE0, [TCG_COND_LE] = I3617_CMLE0,
}; };
static const AArch64Insn cmp0_scalar_insn[16] = {
[TCG_COND_EQ] = I3612_CMEQ0,
[TCG_COND_GT] = I3612_CMGT0,
[TCG_COND_GE] = I3612_CMGE0,
[TCG_COND_LT] = I3612_CMLT0,
[TCG_COND_LE] = I3612_CMLE0,
};
TCGType type = vecl + TCG_TYPE_V64; TCGType type = vecl + TCG_TYPE_V64;
unsigned is_q = vecl; unsigned is_q = vecl;
bool is_scalar = !is_q && vece == MO_64;
TCGArg a0, a1, a2, a3; TCGArg a0, a1, a2, a3;
int cmode, imm8; int cmode, imm8;
@ -2268,19 +2335,35 @@ static void tcg_out_vec_op(TCGContext *s, TCGOpcode opc,
tcg_out_dupm_vec(s, type, vece, a0, a1, a2); tcg_out_dupm_vec(s, type, vece, a0, a1, a2);
break; break;
case INDEX_op_add_vec: case INDEX_op_add_vec:
if (is_scalar) {
tcg_out_insn(s, 3611, ADD, vece, a0, a1, a2);
} else {
tcg_out_insn(s, 3616, ADD, is_q, vece, a0, a1, a2); tcg_out_insn(s, 3616, ADD, is_q, vece, a0, a1, a2);
}
break; break;
case INDEX_op_sub_vec: case INDEX_op_sub_vec:
if (is_scalar) {
tcg_out_insn(s, 3611, SUB, vece, a0, a1, a2);
} else {
tcg_out_insn(s, 3616, SUB, is_q, vece, a0, a1, a2); tcg_out_insn(s, 3616, SUB, is_q, vece, a0, a1, a2);
}
break; break;
case INDEX_op_mul_vec: case INDEX_op_mul_vec:
tcg_out_insn(s, 3616, MUL, is_q, vece, a0, a1, a2); tcg_out_insn(s, 3616, MUL, is_q, vece, a0, a1, a2);
break; break;
case INDEX_op_neg_vec: case INDEX_op_neg_vec:
if (is_scalar) {
tcg_out_insn(s, 3612, NEG, vece, a0, a1);
} else {
tcg_out_insn(s, 3617, NEG, is_q, vece, a0, a1); tcg_out_insn(s, 3617, NEG, is_q, vece, a0, a1);
}
break; break;
case INDEX_op_abs_vec: case INDEX_op_abs_vec:
if (is_scalar) {
tcg_out_insn(s, 3612, ABS, vece, a0, a1);
} else {
tcg_out_insn(s, 3617, ABS, is_q, vece, a0, a1); tcg_out_insn(s, 3617, ABS, is_q, vece, a0, a1);
}
break; break;
case INDEX_op_and_vec: case INDEX_op_and_vec:
if (const_args[2]) { if (const_args[2]) {
@ -2334,16 +2417,32 @@ static void tcg_out_vec_op(TCGContext *s, TCGOpcode opc,
tcg_out_insn(s, 3616, EOR, is_q, 0, a0, a1, a2); tcg_out_insn(s, 3616, EOR, is_q, 0, a0, a1, a2);
break; break;
case INDEX_op_ssadd_vec: case INDEX_op_ssadd_vec:
if (is_scalar) {
tcg_out_insn(s, 3611, SQADD, vece, a0, a1, a2);
} else {
tcg_out_insn(s, 3616, SQADD, is_q, vece, a0, a1, a2); tcg_out_insn(s, 3616, SQADD, is_q, vece, a0, a1, a2);
}
break; break;
case INDEX_op_sssub_vec: case INDEX_op_sssub_vec:
if (is_scalar) {
tcg_out_insn(s, 3611, SQSUB, vece, a0, a1, a2);
} else {
tcg_out_insn(s, 3616, SQSUB, is_q, vece, a0, a1, a2); tcg_out_insn(s, 3616, SQSUB, is_q, vece, a0, a1, a2);
}
break; break;
case INDEX_op_usadd_vec: case INDEX_op_usadd_vec:
if (is_scalar) {
tcg_out_insn(s, 3611, UQADD, vece, a0, a1, a2);
} else {
tcg_out_insn(s, 3616, UQADD, is_q, vece, a0, a1, a2); tcg_out_insn(s, 3616, UQADD, is_q, vece, a0, a1, a2);
}
break; break;
case INDEX_op_ussub_vec: case INDEX_op_ussub_vec:
if (is_scalar) {
tcg_out_insn(s, 3611, UQSUB, vece, a0, a1, a2);
} else {
tcg_out_insn(s, 3616, UQSUB, is_q, vece, a0, a1, a2); tcg_out_insn(s, 3616, UQSUB, is_q, vece, a0, a1, a2);
}
break; break;
case INDEX_op_smax_vec: case INDEX_op_smax_vec:
tcg_out_insn(s, 3616, SMAX, is_q, vece, a0, a1, a2); tcg_out_insn(s, 3616, SMAX, is_q, vece, a0, a1, a2);
@ -2361,19 +2460,39 @@ static void tcg_out_vec_op(TCGContext *s, TCGOpcode opc,
tcg_out_insn(s, 3617, NOT, is_q, 0, a0, a1); tcg_out_insn(s, 3617, NOT, is_q, 0, a0, a1);
break; break;
case INDEX_op_shli_vec: case INDEX_op_shli_vec:
if (is_scalar) {
tcg_out_insn(s, 3609, SHL, a0, a1, a2 + (8 << vece));
} else {
tcg_out_insn(s, 3614, SHL, is_q, a0, a1, a2 + (8 << vece)); tcg_out_insn(s, 3614, SHL, is_q, a0, a1, a2 + (8 << vece));
}
break; break;
case INDEX_op_shri_vec: case INDEX_op_shri_vec:
if (is_scalar) {
tcg_out_insn(s, 3609, USHR, a0, a1, (16 << vece) - a2);
} else {
tcg_out_insn(s, 3614, USHR, is_q, a0, a1, (16 << vece) - a2); tcg_out_insn(s, 3614, USHR, is_q, a0, a1, (16 << vece) - a2);
}
break; break;
case INDEX_op_sari_vec: case INDEX_op_sari_vec:
if (is_scalar) {
tcg_out_insn(s, 3609, SSHR, a0, a1, (16 << vece) - a2);
} else {
tcg_out_insn(s, 3614, SSHR, is_q, a0, a1, (16 << vece) - a2); tcg_out_insn(s, 3614, SSHR, is_q, a0, a1, (16 << vece) - a2);
}
break; break;
case INDEX_op_shlv_vec: case INDEX_op_shlv_vec:
if (is_scalar) {
tcg_out_insn(s, 3611, USHL, vece, a0, a1, a2);
} else {
tcg_out_insn(s, 3616, USHL, is_q, vece, a0, a1, a2); tcg_out_insn(s, 3616, USHL, is_q, vece, a0, a1, a2);
}
break; break;
case INDEX_op_aa64_sshl_vec: case INDEX_op_aa64_sshl_vec:
if (is_scalar) {
tcg_out_insn(s, 3611, SSHL, vece, a0, a1, a2);
} else {
tcg_out_insn(s, 3616, SSHL, is_q, vece, a0, a1, a2); tcg_out_insn(s, 3616, SSHL, is_q, vece, a0, a1, a2);
}
break; break;
case INDEX_op_cmp_vec: case INDEX_op_cmp_vec:
{ {
@ -2382,32 +2501,60 @@ static void tcg_out_vec_op(TCGContext *s, TCGOpcode opc,
if (cond == TCG_COND_NE) { if (cond == TCG_COND_NE) {
if (const_args[2]) { if (const_args[2]) {
if (is_scalar) {
tcg_out_insn(s, 3611, CMTST, vece, a0, a1, a1);
} else {
tcg_out_insn(s, 3616, CMTST, is_q, vece, a0, a1, a1); tcg_out_insn(s, 3616, CMTST, is_q, vece, a0, a1, a1);
}
} else {
if (is_scalar) {
tcg_out_insn(s, 3611, CMEQ, vece, a0, a1, a2);
} else { } else {
tcg_out_insn(s, 3616, CMEQ, is_q, vece, a0, a1, a2); tcg_out_insn(s, 3616, CMEQ, is_q, vece, a0, a1, a2);
}
tcg_out_insn(s, 3617, NOT, is_q, 0, a0, a0); tcg_out_insn(s, 3617, NOT, is_q, 0, a0, a0);
} }
} else { } else {
if (const_args[2]) { if (const_args[2]) {
insn = cmp0_insn[cond]; if (is_scalar) {
insn = cmp0_scalar_insn[cond];
if (insn) {
tcg_out_insn_3612(s, insn, vece, a0, a1);
break;
}
} else {
insn = cmp0_vec_insn[cond];
if (insn) { if (insn) {
tcg_out_insn_3617(s, insn, is_q, vece, a0, a1); tcg_out_insn_3617(s, insn, is_q, vece, a0, a1);
break; break;
} }
}
tcg_out_dupi_vec(s, type, MO_8, TCG_VEC_TMP, 0); tcg_out_dupi_vec(s, type, MO_8, TCG_VEC_TMP, 0);
a2 = TCG_VEC_TMP; a2 = TCG_VEC_TMP;
} }
insn = cmp_insn[cond]; if (is_scalar) {
insn = cmp_scalar_insn[cond];
if (insn == 0) { if (insn == 0) {
TCGArg t; TCGArg t;
t = a1, a1 = a2, a2 = t; t = a1, a1 = a2, a2 = t;
cond = tcg_swap_cond(cond); cond = tcg_swap_cond(cond);
insn = cmp_insn[cond]; insn = cmp_scalar_insn[cond];
tcg_debug_assert(insn != 0);
}
tcg_out_insn_3611(s, insn, vece, a0, a1, a2);
} else {
insn = cmp_vec_insn[cond];
if (insn == 0) {
TCGArg t;
t = a1, a1 = a2, a2 = t;
cond = tcg_swap_cond(cond);
insn = cmp_vec_insn[cond];
tcg_debug_assert(insn != 0); tcg_debug_assert(insn != 0);
} }
tcg_out_insn_3616(s, insn, is_q, vece, a0, a1, a2); tcg_out_insn_3616(s, insn, is_q, vece, a0, a1, a2);
} }
} }
}
break; break;
case INDEX_op_bitsel_vec: case INDEX_op_bitsel_vec: