Skip to content

Commit

Permalink
target/arm: Share table of sve load functions
Browse files Browse the repository at this point in the history 
The table used by do_ldrq is a subset of the table used by do_ld_zpa;
we can share them by passing dtype instead of msz to do_ldrq.

The lack of MTE handling in do_ldrq was a bug, fixed by this change.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210525010358.152808-77-richard.henderson@linaro.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
  • Loading branch information
@rth7680 @pm215
rth7680 authored and pm215 committed May 25, 2021
1 parent 631be02 commit c182c6d
Showing 1 changed file with 126 additions and 128 deletions.
254 changes: 126 additions & 128 deletions target/arm/translate-sve.c
View file
Expand Up @@ -5215,128 +5215,130 @@ static void do_mem_zpa(DisasContext *s, int zt, int pg, TCGv_i64 addr,
tcg_temp_free_i32(t_desc);
}

/* Indexed by [mte][be][dtype][nreg] */
static gen_helper_gvec_mem * const ldr_fns[2][2][16][4] = {
{ /* mte inactive, little-endian */
{ { gen_helper_sve_ld1bb_r, gen_helper_sve_ld2bb_r,
gen_helper_sve_ld3bb_r, gen_helper_sve_ld4bb_r },
{ gen_helper_sve_ld1bhu_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1bsu_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1bdu_r, NULL, NULL, NULL },

{ gen_helper_sve_ld1sds_le_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1hh_le_r, gen_helper_sve_ld2hh_le_r,
gen_helper_sve_ld3hh_le_r, gen_helper_sve_ld4hh_le_r },
{ gen_helper_sve_ld1hsu_le_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1hdu_le_r, NULL, NULL, NULL },

{ gen_helper_sve_ld1hds_le_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1hss_le_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1ss_le_r, gen_helper_sve_ld2ss_le_r,
gen_helper_sve_ld3ss_le_r, gen_helper_sve_ld4ss_le_r },
{ gen_helper_sve_ld1sdu_le_r, NULL, NULL, NULL },

{ gen_helper_sve_ld1bds_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1bss_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1bhs_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1dd_le_r, gen_helper_sve_ld2dd_le_r,
gen_helper_sve_ld3dd_le_r, gen_helper_sve_ld4dd_le_r } },

/* mte inactive, big-endian */
{ { gen_helper_sve_ld1bb_r, gen_helper_sve_ld2bb_r,
gen_helper_sve_ld3bb_r, gen_helper_sve_ld4bb_r },
{ gen_helper_sve_ld1bhu_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1bsu_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1bdu_r, NULL, NULL, NULL },

{ gen_helper_sve_ld1sds_be_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1hh_be_r, gen_helper_sve_ld2hh_be_r,
gen_helper_sve_ld3hh_be_r, gen_helper_sve_ld4hh_be_r },
{ gen_helper_sve_ld1hsu_be_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1hdu_be_r, NULL, NULL, NULL },

{ gen_helper_sve_ld1hds_be_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1hss_be_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1ss_be_r, gen_helper_sve_ld2ss_be_r,
gen_helper_sve_ld3ss_be_r, gen_helper_sve_ld4ss_be_r },
{ gen_helper_sve_ld1sdu_be_r, NULL, NULL, NULL },

{ gen_helper_sve_ld1bds_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1bss_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1bhs_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1dd_be_r, gen_helper_sve_ld2dd_be_r,
gen_helper_sve_ld3dd_be_r, gen_helper_sve_ld4dd_be_r } } },

{ /* mte active, little-endian */
{ { gen_helper_sve_ld1bb_r_mte,
gen_helper_sve_ld2bb_r_mte,
gen_helper_sve_ld3bb_r_mte,
gen_helper_sve_ld4bb_r_mte },
{ gen_helper_sve_ld1bhu_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1bsu_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1bdu_r_mte, NULL, NULL, NULL },

{ gen_helper_sve_ld1sds_le_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1hh_le_r_mte,
gen_helper_sve_ld2hh_le_r_mte,
gen_helper_sve_ld3hh_le_r_mte,
gen_helper_sve_ld4hh_le_r_mte },
{ gen_helper_sve_ld1hsu_le_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1hdu_le_r_mte, NULL, NULL, NULL },

{ gen_helper_sve_ld1hds_le_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1hss_le_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1ss_le_r_mte,
gen_helper_sve_ld2ss_le_r_mte,
gen_helper_sve_ld3ss_le_r_mte,
gen_helper_sve_ld4ss_le_r_mte },
{ gen_helper_sve_ld1sdu_le_r_mte, NULL, NULL, NULL },

{ gen_helper_sve_ld1bds_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1bss_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1bhs_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1dd_le_r_mte,
gen_helper_sve_ld2dd_le_r_mte,
gen_helper_sve_ld3dd_le_r_mte,
gen_helper_sve_ld4dd_le_r_mte } },

/* mte active, big-endian */
{ { gen_helper_sve_ld1bb_r_mte,
gen_helper_sve_ld2bb_r_mte,
gen_helper_sve_ld3bb_r_mte,
gen_helper_sve_ld4bb_r_mte },
{ gen_helper_sve_ld1bhu_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1bsu_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1bdu_r_mte, NULL, NULL, NULL },

{ gen_helper_sve_ld1sds_be_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1hh_be_r_mte,
gen_helper_sve_ld2hh_be_r_mte,
gen_helper_sve_ld3hh_be_r_mte,
gen_helper_sve_ld4hh_be_r_mte },
{ gen_helper_sve_ld1hsu_be_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1hdu_be_r_mte, NULL, NULL, NULL },

{ gen_helper_sve_ld1hds_be_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1hss_be_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1ss_be_r_mte,
gen_helper_sve_ld2ss_be_r_mte,
gen_helper_sve_ld3ss_be_r_mte,
gen_helper_sve_ld4ss_be_r_mte },
{ gen_helper_sve_ld1sdu_be_r_mte, NULL, NULL, NULL },

{ gen_helper_sve_ld1bds_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1bss_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1bhs_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1dd_be_r_mte,
gen_helper_sve_ld2dd_be_r_mte,
gen_helper_sve_ld3dd_be_r_mte,
gen_helper_sve_ld4dd_be_r_mte } } },
};

static void do_ld_zpa(DisasContext *s, int zt, int pg,
TCGv_i64 addr, int dtype, int nreg)
{
static gen_helper_gvec_mem * const fns[2][2][16][4] = {
{ /* mte inactive, little-endian */
{ { gen_helper_sve_ld1bb_r, gen_helper_sve_ld2bb_r,
gen_helper_sve_ld3bb_r, gen_helper_sve_ld4bb_r },
{ gen_helper_sve_ld1bhu_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1bsu_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1bdu_r, NULL, NULL, NULL },

{ gen_helper_sve_ld1sds_le_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1hh_le_r, gen_helper_sve_ld2hh_le_r,
gen_helper_sve_ld3hh_le_r, gen_helper_sve_ld4hh_le_r },
{ gen_helper_sve_ld1hsu_le_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1hdu_le_r, NULL, NULL, NULL },

{ gen_helper_sve_ld1hds_le_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1hss_le_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1ss_le_r, gen_helper_sve_ld2ss_le_r,
gen_helper_sve_ld3ss_le_r, gen_helper_sve_ld4ss_le_r },
{ gen_helper_sve_ld1sdu_le_r, NULL, NULL, NULL },

{ gen_helper_sve_ld1bds_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1bss_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1bhs_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1dd_le_r, gen_helper_sve_ld2dd_le_r,
gen_helper_sve_ld3dd_le_r, gen_helper_sve_ld4dd_le_r } },

/* mte inactive, big-endian */
{ { gen_helper_sve_ld1bb_r, gen_helper_sve_ld2bb_r,
gen_helper_sve_ld3bb_r, gen_helper_sve_ld4bb_r },
{ gen_helper_sve_ld1bhu_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1bsu_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1bdu_r, NULL, NULL, NULL },

{ gen_helper_sve_ld1sds_be_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1hh_be_r, gen_helper_sve_ld2hh_be_r,
gen_helper_sve_ld3hh_be_r, gen_helper_sve_ld4hh_be_r },
{ gen_helper_sve_ld1hsu_be_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1hdu_be_r, NULL, NULL, NULL },

{ gen_helper_sve_ld1hds_be_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1hss_be_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1ss_be_r, gen_helper_sve_ld2ss_be_r,
gen_helper_sve_ld3ss_be_r, gen_helper_sve_ld4ss_be_r },
{ gen_helper_sve_ld1sdu_be_r, NULL, NULL, NULL },

{ gen_helper_sve_ld1bds_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1bss_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1bhs_r, NULL, NULL, NULL },
{ gen_helper_sve_ld1dd_be_r, gen_helper_sve_ld2dd_be_r,
gen_helper_sve_ld3dd_be_r, gen_helper_sve_ld4dd_be_r } } },

{ /* mte active, little-endian */
{ { gen_helper_sve_ld1bb_r_mte,
gen_helper_sve_ld2bb_r_mte,
gen_helper_sve_ld3bb_r_mte,
gen_helper_sve_ld4bb_r_mte },
{ gen_helper_sve_ld1bhu_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1bsu_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1bdu_r_mte, NULL, NULL, NULL },

{ gen_helper_sve_ld1sds_le_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1hh_le_r_mte,
gen_helper_sve_ld2hh_le_r_mte,
gen_helper_sve_ld3hh_le_r_mte,
gen_helper_sve_ld4hh_le_r_mte },
{ gen_helper_sve_ld1hsu_le_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1hdu_le_r_mte, NULL, NULL, NULL },

{ gen_helper_sve_ld1hds_le_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1hss_le_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1ss_le_r_mte,
gen_helper_sve_ld2ss_le_r_mte,
gen_helper_sve_ld3ss_le_r_mte,
gen_helper_sve_ld4ss_le_r_mte },
{ gen_helper_sve_ld1sdu_le_r_mte, NULL, NULL, NULL },

{ gen_helper_sve_ld1bds_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1bss_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1bhs_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1dd_le_r_mte,
gen_helper_sve_ld2dd_le_r_mte,
gen_helper_sve_ld3dd_le_r_mte,
gen_helper_sve_ld4dd_le_r_mte } },

/* mte active, big-endian */
{ { gen_helper_sve_ld1bb_r_mte,
gen_helper_sve_ld2bb_r_mte,
gen_helper_sve_ld3bb_r_mte,
gen_helper_sve_ld4bb_r_mte },
{ gen_helper_sve_ld1bhu_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1bsu_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1bdu_r_mte, NULL, NULL, NULL },

{ gen_helper_sve_ld1sds_be_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1hh_be_r_mte,
gen_helper_sve_ld2hh_be_r_mte,
gen_helper_sve_ld3hh_be_r_mte,
gen_helper_sve_ld4hh_be_r_mte },
{ gen_helper_sve_ld1hsu_be_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1hdu_be_r_mte, NULL, NULL, NULL },

{ gen_helper_sve_ld1hds_be_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1hss_be_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1ss_be_r_mte,
gen_helper_sve_ld2ss_be_r_mte,
gen_helper_sve_ld3ss_be_r_mte,
gen_helper_sve_ld4ss_be_r_mte },
{ gen_helper_sve_ld1sdu_be_r_mte, NULL, NULL, NULL },

{ gen_helper_sve_ld1bds_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1bss_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1bhs_r_mte, NULL, NULL, NULL },
{ gen_helper_sve_ld1dd_be_r_mte,
gen_helper_sve_ld2dd_be_r_mte,
gen_helper_sve_ld3dd_be_r_mte,
gen_helper_sve_ld4dd_be_r_mte } } },
};
gen_helper_gvec_mem *fn
= fns[s->mte_active[0]][s->be_data == MO_BE][dtype][nreg];
= ldr_fns[s->mte_active[0]][s->be_data == MO_BE][dtype][nreg];

/*
* While there are holes in the table, they are not
Expand Down Expand Up @@ -5574,14 +5576,8 @@ static bool trans_LDNF1_zpri(DisasContext *s, arg_rpri_load *a)
return true;
}

static void do_ldrq(DisasContext *s, int zt, int pg, TCGv_i64 addr, int msz)
static void do_ldrq(DisasContext *s, int zt, int pg, TCGv_i64 addr, int dtype)
{
static gen_helper_gvec_mem * const fns[2][4] = {
{ gen_helper_sve_ld1bb_r, gen_helper_sve_ld1hh_le_r,
gen_helper_sve_ld1ss_le_r, gen_helper_sve_ld1dd_le_r },
{ gen_helper_sve_ld1bb_r, gen_helper_sve_ld1hh_be_r,
gen_helper_sve_ld1ss_be_r, gen_helper_sve_ld1dd_be_r },
};
unsigned vsz = vec_full_reg_size(s);
TCGv_ptr t_pg;
TCGv_i32 t_desc;
Expand Down Expand Up @@ -5613,7 +5609,9 @@ static void do_ldrq(DisasContext *s, int zt, int pg, TCGv_i64 addr, int msz)
t_pg = tcg_temp_new_ptr();
tcg_gen_addi_ptr(t_pg, cpu_env, poff);

fns[s->be_data == MO_BE][msz](cpu_env, t_pg, addr, t_desc);
gen_helper_gvec_mem *fn
= ldr_fns[s->mte_active[0]][s->be_data == MO_BE][dtype][0];
fn(cpu_env, t_pg, addr, t_desc);

tcg_temp_free_ptr(t_pg);
tcg_temp_free_i32(t_desc);
Expand All @@ -5635,7 +5633,7 @@ static bool trans_LD1RQ_zprr(DisasContext *s, arg_rprr_load *a)
TCGv_i64 addr = new_tmp_a64(s);
tcg_gen_shli_i64(addr, cpu_reg(s, a->rm), msz);
tcg_gen_add_i64(addr, addr, cpu_reg_sp(s, a->rn));
do_ldrq(s, a->rd, a->pg, addr, msz);
do_ldrq(s, a->rd, a->pg, addr, a->dtype);
}
return true;
}
Expand All @@ -5645,7 +5643,7 @@ static bool trans_LD1RQ_zpri(DisasContext *s, arg_rpri_load *a)
if (sve_access_check(s)) {
TCGv_i64 addr = new_tmp_a64(s);
tcg_gen_addi_i64(addr, cpu_reg_sp(s, a->rn), a->imm * 16);
do_ldrq(s, a->rd, a->pg, addr, dtype_msz(a->dtype));
do_ldrq(s, a->rd, a->pg, addr, a->dtype);
}
return true;
}
Expand Down

0 comments on commit c182c6d

Please sign in to comment.