| Message ID | 20230516194145.1749305-63-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [PULL,01/80] tcg/i386: Set P_REXW in tcg_out_addi_ptr | expand |
On Tue, 16 May 2023 at 20:57, Richard Henderson <richard.henderson@linaro.org> wrote: > > Since we do this inside gen_empty_mem_cb anyway, let's > do this earlier inside tcg expansion. > > Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> The Avocado test tcg_plugins.py:PluginKernelNormal.test_aarch64_virt_mem_icount has stopped working on my machine (it either times out or errors). Bisection fingered this patch as the culprit, though I can't see anything obviously wrong with it... > --- > include/exec/plugin-gen.h | 4 ++-- > accel/tcg/plugin-gen.c | 9 +++------ > tcg/tcg-op-ldst.c | 28 ++++++++++++++++++++-------- > 3 files changed, 25 insertions(+), 16 deletions(-) > > diff --git a/include/exec/plugin-gen.h b/include/exec/plugin-gen.h > index 5f5506f1cc..3af0168e65 100644 > --- a/include/exec/plugin-gen.h > +++ b/include/exec/plugin-gen.h > @@ -27,7 +27,7 @@ void plugin_gen_insn_start(CPUState *cpu, const struct DisasContextBase *db); > void plugin_gen_insn_end(void); > > void plugin_gen_disable_mem_helpers(void); > -void plugin_gen_empty_mem_callback(TCGv addr, uint32_t info); > +void plugin_gen_empty_mem_callback(TCGv_i64 addr, uint32_t info); > > static inline void plugin_insn_append(abi_ptr pc, const void *from, size_t size) > { > @@ -69,7 +69,7 @@ static inline void plugin_gen_tb_end(CPUState *cpu) > static inline void plugin_gen_disable_mem_helpers(void) > { } > > -static inline void plugin_gen_empty_mem_callback(TCGv addr, uint32_t info) > +static inline void plugin_gen_empty_mem_callback(TCGv_i64 addr, uint32_t info) > { } > > static inline void plugin_insn_append(abi_ptr pc, const void *from, size_t size) > diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c > index 907c5004a4..34be1b940c 100644 > --- a/accel/tcg/plugin-gen.c > +++ b/accel/tcg/plugin-gen.c > @@ -124,23 +124,20 @@ static void gen_empty_inline_cb(void) > tcg_temp_free_i64(val); > } > > -static void gen_empty_mem_cb(TCGv addr, uint32_t info) > +static void gen_empty_mem_cb(TCGv_i64 addr, uint32_t info) > { > TCGv_i32 cpu_index = tcg_temp_ebb_new_i32(); > TCGv_i32 meminfo = tcg_temp_ebb_new_i32(); > - TCGv_i64 addr64 = tcg_temp_ebb_new_i64(); > TCGv_ptr udata = tcg_temp_ebb_new_ptr(); > > tcg_gen_movi_i32(meminfo, info); > tcg_gen_movi_ptr(udata, 0); > tcg_gen_ld_i32(cpu_index, cpu_env, > -offsetof(ArchCPU, env) + offsetof(CPUState, cpu_index)); > - tcg_gen_extu_tl_i64(addr64, addr); > > - gen_helper_plugin_vcpu_mem_cb(cpu_index, meminfo, addr64, udata); > + gen_helper_plugin_vcpu_mem_cb(cpu_index, meminfo, addr, udata); > > tcg_temp_free_ptr(udata); > - tcg_temp_free_i64(addr64); > tcg_temp_free_i32(meminfo); > tcg_temp_free_i32(cpu_index); > } > @@ -197,7 +194,7 @@ static void plugin_gen_empty_callback(enum plugin_gen_from from) > } > } > > -void plugin_gen_empty_mem_callback(TCGv addr, uint32_t info) > +void plugin_gen_empty_mem_callback(TCGv_i64 addr, uint32_t info) > { > enum qemu_plugin_mem_rw rw = get_plugin_meminfo_rw(info); > > diff --git a/tcg/tcg-op-ldst.c b/tcg/tcg-op-ldst.c > index b695d2954e..2d5e98971d 100644 > --- a/tcg/tcg-op-ldst.c > +++ b/tcg/tcg-op-ldst.c > @@ -115,13 +115,13 @@ static void tcg_gen_req_mo(TCGBar type) > } > > /* Only required for loads, where value might overlap addr. */ > -static TCGv plugin_maybe_preserve_addr(TCGv vaddr) > +static TCGv_i64 plugin_maybe_preserve_addr(TCGv vaddr) > { > #ifdef CONFIG_PLUGIN > if (tcg_ctx->plugin_insn != NULL) { > /* Save a copy of the vaddr for use after a load. */ > - TCGv temp = tcg_temp_new(); > - tcg_gen_mov_tl(temp, vaddr); > + TCGv_i64 temp = tcg_temp_ebb_new_i64(); > + tcg_gen_extu_tl_i64(temp, vaddr); > return temp; > } > #endif > @@ -129,16 +129,28 @@ static TCGv plugin_maybe_preserve_addr(TCGv vaddr) > } > > static void > -plugin_gen_mem_callbacks(TCGv copy_addr, TCGv orig_addr, MemOpIdx oi, > +plugin_gen_mem_callbacks(TCGv_i64 copy_addr, TCGv orig_addr, MemOpIdx oi, > enum qemu_plugin_mem_rw rw) > { > #ifdef CONFIG_PLUGIN > if (tcg_ctx->plugin_insn != NULL) { > qemu_plugin_meminfo_t info = make_plugin_meminfo(oi, rw); > - plugin_gen_empty_mem_callback(copy_addr ? : orig_addr, info); > + > +#if TARGET_LONG_BITS == 64 > if (copy_addr) { > - tcg_temp_free(copy_addr); > + plugin_gen_empty_mem_callback(copy_addr, info); > + tcg_temp_free_i64(copy_addr); > + } else { > + plugin_gen_empty_mem_callback(orig_addr, info); > } > +#else > + if (!copy_addr) { > + copy_addr = tcg_temp_ebb_new_i64(); > + tcg_gen_extu_tl_i64(copy_addr, orig_addr); > + } > + plugin_gen_empty_mem_callback(copy_addr, info); > + tcg_temp_free_i64(copy_addr); > +#endif > } > #endif > } > @@ -147,7 +159,7 @@ void tcg_gen_qemu_ld_i32(TCGv_i32 val, TCGv addr, TCGArg idx, MemOp memop) > { > MemOp orig_memop; > MemOpIdx oi; > - TCGv copy_addr; > + TCGv_i64 copy_addr; > > tcg_gen_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD); > memop = tcg_canonicalize_memop(memop, 0, 0); > @@ -223,7 +235,7 @@ void tcg_gen_qemu_ld_i64(TCGv_i64 val, TCGv addr, TCGArg idx, MemOp memop) > { > MemOp orig_memop; > MemOpIdx oi; > - TCGv copy_addr; > + TCGv_i64 copy_addr; > > if (TCG_TARGET_REG_BITS == 32 && (memop & MO_SIZE) < MO_64) { > tcg_gen_qemu_ld_i32(TCGV_LOW(val), addr, idx, memop); > -- > 2.34.1 -- PMM
diff --git a/include/exec/plugin-gen.h b/include/exec/plugin-gen.h index 5f5506f1cc..3af0168e65 100644 --- a/include/exec/plugin-gen.h +++ b/include/exec/plugin-gen.h @@ -27,7 +27,7 @@ void plugin_gen_insn_start(CPUState *cpu, const struct DisasContextBase *db); void plugin_gen_insn_end(void); void plugin_gen_disable_mem_helpers(void); -void plugin_gen_empty_mem_callback(TCGv addr, uint32_t info); +void plugin_gen_empty_mem_callback(TCGv_i64 addr, uint32_t info); static inline void plugin_insn_append(abi_ptr pc, const void *from, size_t size) { @@ -69,7 +69,7 @@ static inline void plugin_gen_tb_end(CPUState *cpu) static inline void plugin_gen_disable_mem_helpers(void) { } -static inline void plugin_gen_empty_mem_callback(TCGv addr, uint32_t info) +static inline void plugin_gen_empty_mem_callback(TCGv_i64 addr, uint32_t info) { } static inline void plugin_insn_append(abi_ptr pc, const void *from, size_t size) diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c index 907c5004a4..34be1b940c 100644 --- a/accel/tcg/plugin-gen.c +++ b/accel/tcg/plugin-gen.c @@ -124,23 +124,20 @@ static void gen_empty_inline_cb(void) tcg_temp_free_i64(val); } -static void gen_empty_mem_cb(TCGv addr, uint32_t info) +static void gen_empty_mem_cb(TCGv_i64 addr, uint32_t info) { TCGv_i32 cpu_index = tcg_temp_ebb_new_i32(); TCGv_i32 meminfo = tcg_temp_ebb_new_i32(); - TCGv_i64 addr64 = tcg_temp_ebb_new_i64(); TCGv_ptr udata = tcg_temp_ebb_new_ptr(); tcg_gen_movi_i32(meminfo, info); tcg_gen_movi_ptr(udata, 0); tcg_gen_ld_i32(cpu_index, cpu_env, -offsetof(ArchCPU, env) + offsetof(CPUState, cpu_index)); - tcg_gen_extu_tl_i64(addr64, addr); - gen_helper_plugin_vcpu_mem_cb(cpu_index, meminfo, addr64, udata); + gen_helper_plugin_vcpu_mem_cb(cpu_index, meminfo, addr, udata); tcg_temp_free_ptr(udata); - tcg_temp_free_i64(addr64); tcg_temp_free_i32(meminfo); tcg_temp_free_i32(cpu_index); } @@ -197,7 +194,7 @@ static void plugin_gen_empty_callback(enum plugin_gen_from from) } } -void plugin_gen_empty_mem_callback(TCGv addr, uint32_t info) +void plugin_gen_empty_mem_callback(TCGv_i64 addr, uint32_t info) { enum qemu_plugin_mem_rw rw = get_plugin_meminfo_rw(info); diff --git a/tcg/tcg-op-ldst.c b/tcg/tcg-op-ldst.c index b695d2954e..2d5e98971d 100644 --- a/tcg/tcg-op-ldst.c +++ b/tcg/tcg-op-ldst.c @@ -115,13 +115,13 @@ static void tcg_gen_req_mo(TCGBar type) } /* Only required for loads, where value might overlap addr. */ -static TCGv plugin_maybe_preserve_addr(TCGv vaddr) +static TCGv_i64 plugin_maybe_preserve_addr(TCGv vaddr) { #ifdef CONFIG_PLUGIN if (tcg_ctx->plugin_insn != NULL) { /* Save a copy of the vaddr for use after a load. */ - TCGv temp = tcg_temp_new(); - tcg_gen_mov_tl(temp, vaddr); + TCGv_i64 temp = tcg_temp_ebb_new_i64(); + tcg_gen_extu_tl_i64(temp, vaddr); return temp; } #endif @@ -129,16 +129,28 @@ static TCGv plugin_maybe_preserve_addr(TCGv vaddr) } static void -plugin_gen_mem_callbacks(TCGv copy_addr, TCGv orig_addr, MemOpIdx oi, +plugin_gen_mem_callbacks(TCGv_i64 copy_addr, TCGv orig_addr, MemOpIdx oi, enum qemu_plugin_mem_rw rw) { #ifdef CONFIG_PLUGIN if (tcg_ctx->plugin_insn != NULL) { qemu_plugin_meminfo_t info = make_plugin_meminfo(oi, rw); - plugin_gen_empty_mem_callback(copy_addr ? : orig_addr, info); + +#if TARGET_LONG_BITS == 64 if (copy_addr) { - tcg_temp_free(copy_addr); + plugin_gen_empty_mem_callback(copy_addr, info); + tcg_temp_free_i64(copy_addr); + } else { + plugin_gen_empty_mem_callback(orig_addr, info); } +#else + if (!copy_addr) { + copy_addr = tcg_temp_ebb_new_i64(); + tcg_gen_extu_tl_i64(copy_addr, orig_addr); + } + plugin_gen_empty_mem_callback(copy_addr, info); + tcg_temp_free_i64(copy_addr); +#endif } #endif } @@ -147,7 +159,7 @@ void tcg_gen_qemu_ld_i32(TCGv_i32 val, TCGv addr, TCGArg idx, MemOp memop) { MemOp orig_memop; MemOpIdx oi; - TCGv copy_addr; + TCGv_i64 copy_addr; tcg_gen_req_mo(TCG_MO_LD_LD | TCG_MO_ST_LD); memop = tcg_canonicalize_memop(memop, 0, 0); @@ -223,7 +235,7 @@ void tcg_gen_qemu_ld_i64(TCGv_i64 val, TCGv addr, TCGArg idx, MemOp memop) { MemOp orig_memop; MemOpIdx oi; - TCGv copy_addr; + TCGv_i64 copy_addr; if (TCG_TARGET_REG_BITS == 32 && (memop & MO_SIZE) < MO_64) { tcg_gen_qemu_ld_i32(TCGV_LOW(val), addr, idx, memop);