openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

target/arm: Update REV, PUNPK for pred_desc 

Update all users of do_perm_pred2 for the new
predicate descriptor field definitions.

Cc: qemu-stable@nongnu.org
Buglink: https://bugs.launchpad.net/bugs/1908551
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210113062650.593824-5-richard.henderson@linaro.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2021-01-12 20:26:50 -10:00 committed by Peter Maydell
parent f9b0fccecc
commit 70acaafef2
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/arm/sve_helper.c
View File

@ -2036,8 +2036,8 @@ static uint8_t reverse_bits_8(uint8_t x, int n)
void HELPER(sve_rev_p)(void *vd, void *vn, uint32_t pred_desc) void HELPER(sve_rev_p)(void *vd, void *vn, uint32_t pred_desc)
{ {
intptr_t oprsz = extract32(pred_desc, 0, SIMD_OPRSZ_BITS) + 2; intptr_t oprsz = FIELD_EX32(pred_desc, PREDDESC, OPRSZ);
int esz = extract32(pred_desc, SIMD_DATA_SHIFT, 2); int esz = FIELD_EX32(pred_desc, PREDDESC, ESZ);
intptr_t i, oprsz_2 = oprsz / 2; intptr_t i, oprsz_2 = oprsz / 2;
if (oprsz <= 8) { if (oprsz <= 8) {
@ -2066,8 +2066,8 @@ void HELPER(sve_rev_p)(void *vd, void *vn, uint32_t pred_desc)
void HELPER(sve_punpk_p)(void *vd, void *vn, uint32_t pred_desc) void HELPER(sve_punpk_p)(void *vd, void *vn, uint32_t pred_desc)
{ {
intptr_t oprsz = extract32(pred_desc, 0, SIMD_OPRSZ_BITS) + 2; intptr_t oprsz = FIELD_EX32(pred_desc, PREDDESC, OPRSZ);
intptr_t high = extract32(pred_desc, SIMD_DATA_SHIFT + 2, 1); intptr_t high = FIELD_EX32(pred_desc, PREDDESC, DATA);
uint64_t *d = vd; uint64_t *d = vd;
intptr_t i; intptr_t i;

13
target/arm/translate-sve.c
View File

@ -2145,19 +2145,14 @@ static bool do_perm_pred2(DisasContext *s, arg_rr_esz *a, bool high_odd,
TCGv_ptr t_d = tcg_temp_new_ptr(); TCGv_ptr t_d = tcg_temp_new_ptr();
TCGv_ptr t_n = tcg_temp_new_ptr(); TCGv_ptr t_n = tcg_temp_new_ptr();
TCGv_i32 t_desc; TCGv_i32 t_desc;
int desc; uint32_t desc = 0;
tcg_gen_addi_ptr(t_d, cpu_env, pred_full_reg_offset(s, a->rd)); tcg_gen_addi_ptr(t_d, cpu_env, pred_full_reg_offset(s, a->rd));
tcg_gen_addi_ptr(t_n, cpu_env, pred_full_reg_offset(s, a->rn)); tcg_gen_addi_ptr(t_n, cpu_env, pred_full_reg_offset(s, a->rn));
/* Predicate sizes may be smaller and cannot use simd_desc. desc = FIELD_DP32(desc, PREDDESC, OPRSZ, vsz);
We cannot round up, as we do elsewhere, because we need desc = FIELD_DP32(desc, PREDDESC, ESZ, a->esz);
the exact size for ZIP2 and REV. We retain the style for desc = FIELD_DP32(desc, PREDDESC, DATA, high_odd);
the other helpers for consistency. */
desc = vsz - 2;
desc = deposit32(desc, SIMD_DATA_SHIFT, 2, a->esz);
desc = deposit32(desc, SIMD_DATA_SHIFT + 2, 2, high_odd);
t_desc = tcg_const_i32(desc); t_desc = tcg_const_i32(desc);
fn(t_d, t_n, t_desc); fn(t_d, t_n, t_desc);