From: Thomas Huth <thuth@redhat.com>
To: "Philippe Mathieu-Daudé" <philmd@linaro.org>, qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Eduardo Habkost" <eduardo@habkost.net>,
"Vladimir Sementsov-Ogievskiy" <vsementsov@virtuozzo.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
qemu-s390x@nongnu.org, qemu-ppc@nongnu.org,
qemu-riscv@nongnu.org, qemu-arm@nongnu.org,
"Michael S. Tsirkin" <mst@redhat.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Anthony Perard" <anthony.perard@citrix.com>,
"Paul Durrant" <paul@xen.org>, "Cédric Le Goater" <clg@kaod.org>,
"Nicholas Piggin" <npiggin@gmail.com>,
"Frédéric Barrat" <fbarrat@linux.ibm.com>,
"Daniel Henrique Barboza" <danielhb413@gmail.com>,
"David Gibson" <david@gibson.dropbear.id.au>,
"Harsh Prateek Bora" <harshpb@linux.ibm.com>,
"Alexander Graf" <agraf@csgraf.de>,
"Michael Rolnik" <mrolnik@gmail.com>,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
"Cameron Esfahani" <dirty@apple.com>,
"Roman Bolshakov" <rbolshakov@ddn.com>,
"Marcelo Tosatti" <mtosatti@redhat.com>,
"David Woodhouse" <dwmw2@infradead.org>,
"Laurent Vivier" <laurent@vivier.eu>,
"Aurelien Jarno" <aurelien@aurel32.net>,
"Jiaxun Yang" <jiaxun.yang@flygoat.com>,
"Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>,
"Huacai Chen" <chenhuacai@kernel.org>,
"Chris Wulff" <crwulff@gmail.com>, "Marek Vasut" <marex@denx.de>,
"Stafford Horne" <shorne@gmail.com>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Alistair Francis" <alistair.francis@wdc.com>,
"Bin Meng" <bin.meng@windriver.com>,
"Weiwei Li" <liwei1518@gmail.com>,
"Liu Zhiwei" <zhiwei_liu@linux.alibaba.com>,
"Yoshinori Sato" <ysato@users.sourceforge.jp>,
"David Hildenbrand" <david@redhat.com>,
"Ilya Leoshkevich" <iii@linux.ibm.com>,
"Halil Pasic" <pasic@linux.ibm.com>,
"Christian Borntraeger" <borntraeger@linux.ibm.com>,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
"Artyom Tarasenko" <atar4qemu@gmail.com>,
"Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>,
"Max Filippov" <jcmvbkbc@gmail.com>,
xen-devel@lists.xenproject.org, kvm@vger.kernel.org
Subject: Re: [PATCH 2/2] bulk: Prefer fast cpu_env() over slower CPU QOM cast macro
Date: Fri, 26 Jan 2024 18:09:08 +0100 [thread overview]
Message-ID: <135941df-2f8b-4fd5-91c7-40b413e6eae3@redhat.com> (raw)
In-Reply-To: <20240125165648.49898-3-philmd@linaro.org>
On 25/01/2024 17.56, Philippe Mathieu-Daudé wrote:
> Mechanical patch produced running the command documented
> in scripts/coccinelle/cpu_env.cocci_template header.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> target/i386/hvf/vmx.h | 9 +++----
> hw/i386/vmmouse.c | 6 ++---
> hw/i386/xen/xen-hvm.c | 3 +--
> hw/intc/arm_gicv3_cpuif_common.c | 3 +--
> hw/ppc/mpc8544_guts.c | 3 +--
> hw/ppc/pnv.c | 3 +--
> hw/ppc/pnv_xscom.c | 3 +--
> hw/ppc/ppce500_spin.c | 3 +--
> hw/ppc/spapr.c | 3 +--
> hw/ppc/spapr_caps.c | 6 ++---
> target/alpha/cpu.c | 21 +++++----------
> target/alpha/gdbstub.c | 6 ++---
> target/alpha/helper.c | 12 +++------
> target/alpha/mem_helper.c | 9 +++----
> target/arm/cpu.c | 15 ++++-------
> target/arm/debug_helper.c | 6 ++---
> target/arm/gdbstub.c | 6 ++---
> target/arm/gdbstub64.c | 6 ++---
> target/arm/helper.c | 9 +++----
> target/arm/hvf/hvf.c | 12 +++------
> target/arm/kvm.c | 3 +--
> target/arm/ptw.c | 3 +--
> target/arm/tcg/cpu32.c | 3 +--
> target/avr/cpu.c | 21 +++++----------
> target/avr/gdbstub.c | 6 ++---
> target/avr/helper.c | 9 +++----
> target/cris/cpu.c | 3 +--
> target/cris/gdbstub.c | 9 +++----
> target/cris/helper.c | 12 +++------
> target/cris/translate.c | 3 +--
> target/hppa/cpu.c | 6 ++---
> target/hppa/int_helper.c | 6 ++---
> target/hppa/mem_helper.c | 3 +--
> target/i386/arch_memory_mapping.c | 3 +--
> target/i386/cpu-dump.c | 3 +--
> target/i386/cpu.c | 36 +++++++++----------------
> target/i386/helper.c | 30 +++++++--------------
> target/i386/hvf/hvf.c | 6 ++---
> target/i386/hvf/x86.c | 3 +--
> target/i386/hvf/x86_emu.c | 6 ++---
> target/i386/hvf/x86_task.c | 10 +++----
> target/i386/hvf/x86hvf.c | 6 ++---
> target/i386/kvm/kvm.c | 6 ++---
> target/i386/kvm/xen-emu.c | 30 +++++++--------------
> target/i386/tcg/sysemu/bpt_helper.c | 3 +--
> target/i386/tcg/tcg-cpu.c | 12 +++------
> target/i386/tcg/user/excp_helper.c | 3 +--
> target/i386/tcg/user/seg_helper.c | 3 +--
> target/m68k/cpu.c | 30 +++++++--------------
> target/m68k/gdbstub.c | 6 ++---
> target/m68k/helper.c | 3 +--
> target/m68k/m68k-semi.c | 6 ++---
> target/m68k/op_helper.c | 9 +++----
> target/m68k/translate.c | 3 +--
> target/microblaze/helper.c | 3 +--
> target/microblaze/translate.c | 3 +--
> target/mips/cpu.c | 9 +++----
> target/mips/gdbstub.c | 6 ++---
> target/mips/kvm.c | 27 +++++++------------
> target/mips/sysemu/physaddr.c | 3 +--
> target/mips/tcg/exception.c | 3 +--
> target/mips/tcg/op_helper.c | 3 +--
> target/mips/tcg/sysemu/special_helper.c | 3 +--
> target/mips/tcg/sysemu/tlb_helper.c | 6 ++---
> target/mips/tcg/translate.c | 3 +--
> target/nios2/cpu.c | 9 +++----
> target/nios2/helper.c | 3 +--
> target/nios2/nios2-semi.c | 6 ++---
> target/openrisc/gdbstub.c | 3 +--
> target/openrisc/interrupt.c | 6 ++---
> target/openrisc/translate.c | 3 +--
> target/ppc/cpu_init.c | 9 +++----
> target/ppc/excp_helper.c | 3 +--
> target/ppc/gdbstub.c | 12 +++------
> target/ppc/kvm.c | 6 ++---
> target/ppc/ppc-qmp-cmds.c | 3 +--
> target/ppc/user_only_helper.c | 3 +--
> target/riscv/arch_dump.c | 6 ++---
> target/riscv/cpu.c | 15 ++++-------
> target/riscv/cpu_helper.c | 13 +++------
> target/riscv/debug.c | 9 +++----
> target/riscv/gdbstub.c | 6 ++---
> target/riscv/kvm/kvm-cpu.c | 6 ++---
> target/riscv/tcg/tcg-cpu.c | 9 +++----
> target/riscv/translate.c | 3 +--
> target/rx/gdbstub.c | 6 ++---
> target/rx/helper.c | 6 ++---
> target/rx/translate.c | 3 +--
> target/s390x/cpu-dump.c | 3 +--
> target/s390x/gdbstub.c | 6 ++---
> target/s390x/helper.c | 3 +--
> target/s390x/kvm/kvm.c | 6 ++---
> target/s390x/tcg/excp_helper.c | 9 +++----
> target/s390x/tcg/translate.c | 3 +--
> target/sh4/cpu.c | 15 ++++-------
> target/sh4/gdbstub.c | 6 ++---
> target/sh4/helper.c | 9 +++----
> target/sh4/translate.c | 3 +--
> target/sparc/cpu.c | 12 +++------
> target/sparc/gdbstub.c | 3 +--
> target/sparc/int32_helper.c | 3 +--
> target/sparc/int64_helper.c | 3 +--
> target/sparc/ldst_helper.c | 6 ++---
> target/sparc/mmu_helper.c | 15 ++++-------
> target/sparc/translate.c | 3 +--
> target/tricore/cpu.c | 12 +++------
> target/tricore/gdbstub.c | 6 ++---
> target/tricore/helper.c | 3 +--
> target/tricore/translate.c | 3 +--
> target/xtensa/dbg_helper.c | 3 +--
> target/xtensa/exc_helper.c | 3 +--
> target/xtensa/gdbstub.c | 6 ++---
> target/xtensa/helper.c | 9 +++----
> target/xtensa/translate.c | 3 +--
> 114 files changed, 273 insertions(+), 548 deletions(-)
A huge patch ... I wonder whether it would make sense to split it up by
target architecture to ease the review?
...
> diff --git a/hw/i386/vmmouse.c b/hw/i386/vmmouse.c
> index a8d014d09a..eb0613bfbe 100644
> --- a/hw/i386/vmmouse.c
> +++ b/hw/i386/vmmouse.c
> @@ -74,8 +74,7 @@ struct VMMouseState {
>
> static void vmmouse_get_data(uint32_t *data)
> {
> - X86CPU *cpu = X86_CPU(current_cpu);
> - CPUX86State *env = &cpu->env;
> + CPUX86State *env = cpu_env(CPU(current_cpu));
No need for the CPU() cast here, current_cpu is already
of type "CPUState *".
>
> data[0] = env->regs[R_EAX]; data[1] = env->regs[R_EBX];
> data[2] = env->regs[R_ECX]; data[3] = env->regs[R_EDX];
> @@ -84,8 +83,7 @@ static void vmmouse_get_data(uint32_t *data)
>
> static void vmmouse_set_data(const uint32_t *data)
> {
> - X86CPU *cpu = X86_CPU(current_cpu);
> - CPUX86State *env = &cpu->env;
> + CPUX86State *env = cpu_env(CPU(current_cpu));
dito.
> env->regs[R_EAX] = data[0]; env->regs[R_EBX] = data[1];
> env->regs[R_ECX] = data[2]; env->regs[R_EDX] = data[3];
> diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
> index f42621e674..3d3ae49be5 100644
> --- a/hw/i386/xen/xen-hvm.c
> +++ b/hw/i386/xen/xen-hvm.c
> @@ -487,8 +487,7 @@ static void regs_to_cpu(vmware_regs_t *vmport_regs, ioreq_t *req)
>
> static void regs_from_cpu(vmware_regs_t *vmport_regs)
> {
> - X86CPU *cpu = X86_CPU(current_cpu);
> - CPUX86State *env = &cpu->env;
> + CPUX86State *env = cpu_env(CPU(current_cpu));
dito.
> vmport_regs->ebx = env->regs[R_EBX];
> vmport_regs->ecx = env->regs[R_ECX];
...
> diff --git a/hw/ppc/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c
> index a26e83d048..3c6a852ad4 100644
> --- a/hw/ppc/mpc8544_guts.c
> +++ b/hw/ppc/mpc8544_guts.c
> @@ -71,8 +71,7 @@ static uint64_t mpc8544_guts_read(void *opaque, hwaddr addr,
> unsigned size)
> {
> uint32_t value = 0;
> - PowerPCCPU *cpu = POWERPC_CPU(current_cpu);
> - CPUPPCState *env = &cpu->env;
> + CPUPPCState *env = cpu_env(CPU(current_cpu));
dito ...
I'll stop here, please respin with the cpu_env(CPU(current_cpu)) fixed to
cpu_env(current_cpu), and please split the patch by target CPU types.
Thanks,
Thomas
next prev parent reply other threads:[~2024-01-26 17:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-25 16:56 [PATCH 0/2] hw, target: Prefer fast cpu_env() over slower CPU QOM cast macro Philippe Mathieu-Daudé
2024-01-25 16:56 ` [PATCH 1/2] scripts/coccinelle: Add cpu_env.cocci_template script Philippe Mathieu-Daudé
2024-01-26 10:38 ` Philippe Mathieu-Daudé
2024-01-26 11:24 ` Paolo Bonzini
2024-01-26 12:34 ` Philippe Mathieu-Daudé
2024-01-26 13:50 ` Philippe Mathieu-Daudé
2024-01-25 16:56 ` [PATCH 2/2] bulk: Prefer fast cpu_env() over slower CPU QOM cast macro Philippe Mathieu-Daudé
2024-01-26 17:09 ` Thomas Huth [this message]
2024-01-26 21:11 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=135941df-2f8b-4fd5-91c7-40b413e6eae3@redhat.com \
--to=thuth@redhat.com \
--cc=agraf@csgraf.de \
--cc=aleksandar.rikalo@syrmia.com \
--cc=alistair.francis@wdc.com \
--cc=anthony.perard@citrix.com \
--cc=atar4qemu@gmail.com \
--cc=aurelien@aurel32.net \
--cc=bin.meng@windriver.com \
--cc=borntraeger@linux.ibm.com \
--cc=chenhuacai@kernel.org \
--cc=clg@kaod.org \
--cc=crwulff@gmail.com \
--cc=danielhb413@gmail.com \
--cc=david@gibson.dropbear.id.au \
--cc=david@redhat.com \
--cc=dirty@apple.com \
--cc=dwmw2@infradead.org \
--cc=edgar.iglesias@gmail.com \
--cc=eduardo@habkost.net \
--cc=fbarrat@linux.ibm.com \
--cc=harshpb@linux.ibm.com \
--cc=iii@linux.ibm.com \
--cc=jcmvbkbc@gmail.com \
--cc=jiaxun.yang@flygoat.com \
--cc=kbastian@mail.uni-paderborn.de \
--cc=kvm@vger.kernel.org \
--cc=laurent@vivier.eu \
--cc=liwei1518@gmail.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=marex@denx.de \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=mrolnik@gmail.com \
--cc=mst@redhat.com \
--cc=mtosatti@redhat.com \
--cc=npiggin@gmail.com \
--cc=palmer@dabbelt.com \
--cc=pasic@linux.ibm.com \
--cc=paul@xen.org \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=rbolshakov@ddn.com \
--cc=richard.henderson@linaro.org \
--cc=shorne@gmail.com \
--cc=sstabellini@kernel.org \
--cc=vsementsov@virtuozzo.com \
--cc=xen-devel@lists.xenproject.org \
--cc=ysato@users.sourceforge.jp \
--cc=zhiwei_liu@linux.alibaba.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).