| Message ID | 20180621015359.12018-5-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | target/arm SVE patches | expand |
On 21 June 2018 at 02:53, Richard Henderson <richard.henderson@linaro.org> wrote: > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > target/arm/translate-sve.c | 52 ++++++++++++++++++++++++++++++++++++++ > target/arm/sve.decode | 9 +++++++ > 2 files changed, 61 insertions(+) Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
Richard Henderson <richard.henderson@linaro.org> writes: > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > target/arm/translate-sve.c | 52 ++++++++++++++++++++++++++++++++++++++ > target/arm/sve.decode | 9 +++++++ > 2 files changed, 61 insertions(+) > > diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c > index b25fe96b77..83de87ee0e 100644 > --- a/target/arm/translate-sve.c > +++ b/target/arm/translate-sve.c > @@ -3717,6 +3717,58 @@ static bool trans_LDNF1_zpri(DisasContext *s, arg_rpri_load *a, uint32_t insn) > return true; > } > > +static void do_ldrq(DisasContext *s, int zt, int pg, TCGv_i64 addr, int msz) > +{ > + static gen_helper_gvec_mem * const fns[4] = { > + gen_helper_sve_ld1bb_r, gen_helper_sve_ld1hh_r, > + gen_helper_sve_ld1ss_r, gen_helper_sve_ld1dd_r, > + }; > + unsigned vsz = vec_full_reg_size(s); > + TCGv_ptr t_pg; > + TCGv_i32 desc; > + > + /* Load the first quadword using the normal predicated load helpers. */ > + desc = tcg_const_i32(simd_desc(16, 16, zt)); > + t_pg = tcg_temp_new_ptr(); > + > + tcg_gen_addi_ptr(t_pg, cpu_env, pred_full_reg_offset(s, pg)); > + fns[msz](cpu_env, t_pg, addr, desc); > + > + tcg_temp_free_ptr(t_pg); > + tcg_temp_free_i32(desc); > + > + /* Replicate that first quadword. */ > + if (vsz > 16) { > + unsigned dofs = vec_full_reg_offset(s, zt); > + tcg_gen_gvec_dup_mem(4, dofs + 16, dofs, vsz - 16, vsz - 16); > + } > +} > + > +static bool trans_LD1RQ_zprr(DisasContext *s, arg_rprr_load *a, uint32_t insn) > +{ > + if (a->rm == 31) { > + return false; > + } > + if (sve_access_check(s)) { > + int msz = dtype_msz(a->dtype); > + 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); > + } > + return true; > +} > + > +static bool trans_LD1RQ_zpri(DisasContext *s, arg_rpri_load *a, uint32_t insn) > +{ > + 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)); > + } > + return true; > +} > + > static void do_st_zpa(DisasContext *s, int zt, int pg, TCGv_i64 addr, > int msz, int esz, int nreg) > { > diff --git a/target/arm/sve.decode b/target/arm/sve.decode > index 6e159faaec..606c4f623c 100644 > --- a/target/arm/sve.decode > +++ b/target/arm/sve.decode > @@ -715,6 +715,15 @@ LD_zprr 1010010 .. nreg:2 ..... 110 ... ..... ..... @rprr_load_msz > # LD2B, LD2H, LD2W, LD2D; etc. > LD_zpri 1010010 .. nreg:2 0.... 111 ... ..... ..... @rpri_load_msz > > +# SVE load and broadcast quadword (scalar plus scalar) > +LD1RQ_zprr 1010010 .. 00 ..... 000 ... ..... ..... \ > + @rprr_load_msz nreg=0 > + > +# SVE load and broadcast quadword (scalar plus immediate) > +# LD1RQB, LD1RQH, LD1RQS, LD1RQD > +LD1RQ_zpri 1010010 .. 00 0.... 001 ... ..... ..... \ > + @rpri_load_msz nreg=0 > + > ### SVE Memory Store Group > > # SVE contiguous store (scalar plus immediate) -- Alex Bennée
diff --git a/target/arm/translate-sve.c b/target/arm/translate-sve.c index b25fe96b77..83de87ee0e 100644 --- a/target/arm/translate-sve.c +++ b/target/arm/translate-sve.c @@ -3717,6 +3717,58 @@ static bool trans_LDNF1_zpri(DisasContext *s, arg_rpri_load *a, uint32_t insn) return true; } +static void do_ldrq(DisasContext *s, int zt, int pg, TCGv_i64 addr, int msz) +{ + static gen_helper_gvec_mem * const fns[4] = { + gen_helper_sve_ld1bb_r, gen_helper_sve_ld1hh_r, + gen_helper_sve_ld1ss_r, gen_helper_sve_ld1dd_r, + }; + unsigned vsz = vec_full_reg_size(s); + TCGv_ptr t_pg; + TCGv_i32 desc; + + /* Load the first quadword using the normal predicated load helpers. */ + desc = tcg_const_i32(simd_desc(16, 16, zt)); + t_pg = tcg_temp_new_ptr(); + + tcg_gen_addi_ptr(t_pg, cpu_env, pred_full_reg_offset(s, pg)); + fns[msz](cpu_env, t_pg, addr, desc); + + tcg_temp_free_ptr(t_pg); + tcg_temp_free_i32(desc); + + /* Replicate that first quadword. */ + if (vsz > 16) { + unsigned dofs = vec_full_reg_offset(s, zt); + tcg_gen_gvec_dup_mem(4, dofs + 16, dofs, vsz - 16, vsz - 16); + } +} + +static bool trans_LD1RQ_zprr(DisasContext *s, arg_rprr_load *a, uint32_t insn) +{ + if (a->rm == 31) { + return false; + } + if (sve_access_check(s)) { + int msz = dtype_msz(a->dtype); + 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); + } + return true; +} + +static bool trans_LD1RQ_zpri(DisasContext *s, arg_rpri_load *a, uint32_t insn) +{ + 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)); + } + return true; +} + static void do_st_zpa(DisasContext *s, int zt, int pg, TCGv_i64 addr, int msz, int esz, int nreg) { diff --git a/target/arm/sve.decode b/target/arm/sve.decode index 6e159faaec..606c4f623c 100644 --- a/target/arm/sve.decode +++ b/target/arm/sve.decode @@ -715,6 +715,15 @@ LD_zprr 1010010 .. nreg:2 ..... 110 ... ..... ..... @rprr_load_msz # LD2B, LD2H, LD2W, LD2D; etc. LD_zpri 1010010 .. nreg:2 0.... 111 ... ..... ..... @rpri_load_msz +# SVE load and broadcast quadword (scalar plus scalar) +LD1RQ_zprr 1010010 .. 00 ..... 000 ... ..... ..... \ + @rprr_load_msz nreg=0 + +# SVE load and broadcast quadword (scalar plus immediate) +# LD1RQB, LD1RQH, LD1RQS, LD1RQD +LD1RQ_zpri 1010010 .. 00 0.... 001 ... ..... ..... \ + @rpri_load_msz nreg=0 + ### SVE Memory Store Group # SVE contiguous store (scalar plus immediate)
Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- target/arm/translate-sve.c | 52 ++++++++++++++++++++++++++++++++++++++ target/arm/sve.decode | 9 +++++++ 2 files changed, 61 insertions(+) -- 2.17.1