tcg: Add write_aofs to GVecGen4

This allows writing 2 output, 3 input operations.

Backports commit 5d6acdd4a485f15b1081acc523b99c1f1a7c42ab from qemu
This commit is contained in:
Richard Henderson 2019-01-29 16:00:08 -05:00 committed by Lioncash
parent e08d0feee4
commit f1f2d78a52
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 21 additions and 8 deletions

View file

@ -665,7 +665,7 @@ static void expand_3_i32(TCGContext *s, uint32_t dofs, uint32_t aofs,
/* Expand OPSZ bytes worth of three-operand operations using i32 elements. */
static void expand_4_i32(TCGContext *s, uint32_t dofs, uint32_t aofs, uint32_t bofs,
uint32_t cofs, uint32_t oprsz,
uint32_t cofs, uint32_t oprsz, bool write_aofs,
void (*fni)(TCGContext *, TCGv_i32, TCGv_i32, TCGv_i32, TCGv_i32))
{
TCGv_i32 t0 = tcg_temp_new_i32(s);
@ -680,6 +680,9 @@ static void expand_4_i32(TCGContext *s, uint32_t dofs, uint32_t aofs, uint32_t b
tcg_gen_ld_i32(s, t3, s->cpu_env, cofs + i);
fni(s, t0, t1, t2, t3);
tcg_gen_st_i32(s, t0, s->cpu_env, dofs + i);
if (write_aofs) {
tcg_gen_st_i32(s, t1, s->cpu_env, aofs + i);
}
}
tcg_temp_free_i32(s, t3);
tcg_temp_free_i32(s, t2);
@ -769,7 +772,7 @@ static void expand_3_i64(TCGContext *s, uint32_t dofs, uint32_t aofs,
/* Expand OPSZ bytes worth of three-operand operations using i64 elements. */
static void expand_4_i64(TCGContext *s, uint32_t dofs, uint32_t aofs, uint32_t bofs,
uint32_t cofs, uint32_t oprsz,
uint32_t cofs, uint32_t oprsz, bool write_aofs,
void (*fni)(TCGContext *, TCGv_i64, TCGv_i64, TCGv_i64, TCGv_i64))
{
TCGv_i64 t0 = tcg_temp_new_i64(s);
@ -784,6 +787,9 @@ static void expand_4_i64(TCGContext *s, uint32_t dofs, uint32_t aofs, uint32_t b
tcg_gen_ld_i64(s, t3, s->cpu_env, cofs + i);
fni(s, t0, t1, t2, t3);
tcg_gen_st_i64(s, t0, s->cpu_env, dofs + i);
if (write_aofs) {
tcg_gen_st_i64(s, t1, s->cpu_env, aofs + i);
}
}
tcg_temp_free_i64(s, t3);
tcg_temp_free_i64(s, t2);
@ -880,7 +886,7 @@ static void expand_3_vec(TCGContext *s, unsigned vece, uint32_t dofs, uint32_t a
/* Expand OPSZ bytes worth of four-operand operations using host vectors. */
static void expand_4_vec(TCGContext *s, unsigned vece, uint32_t dofs, uint32_t aofs,
uint32_t bofs, uint32_t cofs, uint32_t oprsz,
uint32_t tysz, TCGType type,
uint32_t tysz, TCGType type, bool write_aofs,
void (*fni)(TCGContext *, unsigned, TCGv_vec, TCGv_vec,
TCGv_vec, TCGv_vec))
{
@ -896,6 +902,9 @@ static void expand_4_vec(TCGContext *s, unsigned vece, uint32_t dofs, uint32_t a
tcg_gen_ld_vec(s, t3, s->cpu_env, cofs + i);
fni(s, vece, t0, t1, t2, t3);
tcg_gen_st_vec(s, t0, s->cpu_env, dofs + i);
if (write_aofs) {
tcg_gen_st_vec(s, t1, s->cpu_env, aofs + i);
}
}
tcg_temp_free_vec(s, t3);
tcg_temp_free_vec(s, t2);
@ -1188,7 +1197,7 @@ void tcg_gen_gvec_4(TCGContext *s, uint32_t dofs, uint32_t aofs, uint32_t bofs,
some = QEMU_ALIGN_DOWN(oprsz, 32);
uint32_t some = QEMU_ALIGN_DOWN(oprsz, 32);
expand_4_vec(s, g->vece, dofs, aofs, bofs, cofs, some,
32, TCG_TYPE_V256, g->fniv);
32, TCG_TYPE_V256, g->write_aofs, g->fniv);
if (some == oprsz) {
break;
}
@ -1201,18 +1210,20 @@ void tcg_gen_gvec_4(TCGContext *s, uint32_t dofs, uint32_t aofs, uint32_t bofs,
/* fallthru */
case TCG_TYPE_V128:
expand_4_vec(s, g->vece, dofs, aofs, bofs, cofs, oprsz,
16, TCG_TYPE_V128, g->fniv);
16, TCG_TYPE_V128, g->write_aofs, g->fniv);
break;
case TCG_TYPE_V64:
expand_4_vec(s, g->vece, dofs, aofs, bofs, cofs, oprsz,
8, TCG_TYPE_V64, g->fniv);
8, TCG_TYPE_V64, g->write_aofs, g->fniv);
break;
case 0:
if (g->fni8 && check_size_impl(oprsz, 8)) {
expand_4_i64(s, dofs, aofs, bofs, cofs, oprsz, g->fni8);
expand_4_i64(s, dofs, aofs, bofs, cofs, oprsz,
g->write_aofs, g->fni8);
} else if (g->fni4 && check_size_impl(oprsz, 4)) {
expand_4_i32(s, dofs, aofs, bofs, cofs, oprsz, g->fni4);
expand_4_i32(s, dofs, aofs, bofs, cofs, oprsz,
g->write_aofs, g->fni4);
} else {
assert(g->fno != NULL);
tcg_gen_gvec_4_ool(s, dofs, aofs, bofs, cofs,

View file

@ -181,6 +181,8 @@ typedef struct {
uint8_t vece;
/* Prefer i64 to v64. */
bool prefer_i64;
/* Write aofs as a 2nd dest operand. */
bool write_aofs;
} GVecGen4;
void tcg_gen_gvec_2(TCGContext *, uint32_t dofs, uint32_t aofs,