On 3/24/25 21:58, Pierrick Bouvier wrote:
> This series focuses on removing compilation units duplication in hw/arm. We
> start with this architecture because it should not be too hard to transform it,
> and should give us some good hints on the difficulties we'll meet later.
>
> We first start by making changes in global headers to be able to not rely on
> specific target defines. In particular, we completely remove cpu-all.h.
> We then focus on removing those defines from target/arm/cpu.h.
>
> From there, we modify build system to create a new hw common library (per base
> architecture, "arm" in this case), instead of compiling the same files for every
> target.
>
> Finally, we can declare hw/arm/boot.c, and most of the boards as common as a
> first step for this part.
>
> - Based-on: 20250317183417.285700-1-pierrick.bouvier@linaro.org
> ("[PATCH v6 00/18] make system memory API available for common code")
> https://lore.kernel.org/qemu-devel/20250317183417.285700-1-pierrick.bouvier@linaro.org/
> - Based-on: 20250318213209.2579218-1-richard.henderson@linaro.org
> ("[PATCH v2 00/42] accel/tcg, codebase: Build once patches")
> https://lore.kernel.org/qemu-devel/20250318213209.2579218-1-richard.henderson@linaro.org
>
> v2:
> - rebase on top of Richard series
> - add target include in hw_common lib
> - hw_common_lib uses -DCOMPILE_SYSTEM_VS_USER introduced by Richard series
> - remove cpu-all header
> - remove BSWAP_NEEDED define
> - new tlb-flags header
> - Cleanup i386 KVM_HAVE_MCE_INJECTION definition + move KVM_HAVE_MCE_INJECTION
> - remove comment about cs_base in target/arm/cpu.h
> - updated commit message about registers visibility between aarch32/aarch64
> - tried remove ifdefs in target/arm/helper.c but this resulted in more a ugly
> result. So just comment calls for now, as we'll clean this file later.
> - make most of the boards in hw/arm common
>
> v3:
> - rebase on top of Richard series and master
> - BSWAP_NEEDED commit was already merged
> - Update description for commits removing kvm related headers
>
> Pierrick Bouvier (29):
> exec/cpu-all: extract tlb flags defines to exec/tlb-flags.h
> exec/cpu-all: move cpu_copy to linux-user/qemu.h
> include/exec/cpu-all: move compile time check for CPUArchState to
> cpu-target.c
> exec/cpu-all: remove system/memory include
> exec/cpu-all: remove exec/page-protection include
> exec/cpu-all: remove tswap include
> exec/cpu-all: remove exec/cpu-interrupt include
> exec/cpu-all: remove exec/cpu-defs include
> exec/cpu-all: remove exec/target_page include
> exec/cpu-all: remove hw/core/cpu.h include
> accel/tcg: fix missing includes for TCG_GUEST_DEFAULT_MO
> accel/tcg: fix missing includes for TARGET_HAS_PRECISE_SMC
> exec/cpu-all: remove cpu include
> exec/cpu-all: transfer exec/cpu-common include to cpu.h headers
> exec/cpu-all: remove this header
> exec/target_page: runtime defintion for TARGET_PAGE_BITS_MIN
> accel/kvm: move KVM_HAVE_MCE_INJECTION define to kvm-all.c
> exec/poison: KVM_HAVE_MCE_INJECTION can now be poisoned
> target/arm/cpu: always define kvm related registers
> target/arm/cpu: flags2 is always uint64_t
> target/arm/cpu: define same set of registers for aarch32 and aarch64
> target/arm/cpu: remove inline stubs for aarch32 emulation
> meson: add common hw files
> hw/arm/boot: make compilation unit hw common
> hw/arm/armv7m: prepare compilation unit to be common
> hw/arm/digic_boards: prepare compilation unit to be common
> hw/arm/xlnx-zynqmp: prepare compilation unit to be common
> hw/arm/xlnx-versal: prepare compilation unit to be common
> hw/arm: make most of the compilation units common
>
> meson.build | 37 +++++++-
> accel/tcg/internal-target.h | 1 +
> accel/tcg/tb-internal.h | 1 -
> hw/s390x/ipl.h | 2 +
> include/exec/cpu_ldst.h | 1 +
> include/exec/exec-all.h | 1 +
> include/exec/poison.h | 4 +
> include/exec/target_page.h | 3 +
> include/exec/{cpu-all.h => tlb-flags.h} | 26 +-----
> include/hw/core/cpu.h | 2 +-
> include/qemu/bswap.h | 2 +-
> include/system/kvm.h | 2 -
> linux-user/qemu.h | 3 +
> linux-user/sparc/target_syscall.h | 2 +
> target/alpha/cpu.h | 4 +-
> target/arm/cpu.h | 40 ++------
> target/arm/internals.h | 1 +
> target/avr/cpu.h | 4 +-
> target/hexagon/cpu.h | 3 +-
> target/hppa/cpu.h | 5 +-
> target/i386/cpu.h | 5 +-
> target/i386/hvf/vmx.h | 1 +
> target/loongarch/cpu.h | 4 +-
> target/m68k/cpu.h | 4 +-
> target/microblaze/cpu.h | 4 +-
> target/mips/cpu.h | 4 +-
> target/openrisc/cpu.h | 4 +-
> target/ppc/cpu.h | 4 +-
> target/ppc/mmu-hash32.h | 2 +
> target/ppc/mmu-hash64.h | 2 +
> target/riscv/cpu.h | 4 +-
> target/rx/cpu.h | 4 +-
> target/s390x/cpu.h | 4 +-
> target/sh4/cpu.h | 4 +-
> target/sparc/cpu.h | 4 +-
> target/tricore/cpu.h | 3 +-
> target/xtensa/cpu.h | 4 +-
> accel/kvm/kvm-all.c | 5 +
> accel/tcg/cpu-exec.c | 3 +-
> accel/tcg/cputlb.c | 1 +
> accel/tcg/tb-maint.c | 1 +
> accel/tcg/translate-all.c | 1 +
> accel/tcg/user-exec.c | 2 +
> cpu-target.c | 5 +
> hw/alpha/dp264.c | 1 +
> hw/alpha/typhoon.c | 1 +
> hw/arm/armv7m.c | 8 +-
> hw/arm/boot.c | 2 +
> hw/arm/digic_boards.c | 2 +-
> hw/arm/smmuv3.c | 1 +
> hw/arm/xlnx-versal.c | 2 -
> hw/arm/xlnx-zynqmp.c | 2 -
> hw/hppa/machine.c | 1 +
> hw/i386/multiboot.c | 1 +
> hw/i386/pc.c | 1 +
> hw/i386/pc_sysfw_ovmf.c | 1 +
> hw/i386/vapic.c | 1 +
> hw/loongarch/virt.c | 1 +
> hw/m68k/next-cube.c | 1 +
> hw/m68k/q800.c | 1 +
> hw/m68k/virt.c | 1 +
> hw/openrisc/boot.c | 1 +
> hw/pci-host/astro.c | 1 +
> hw/ppc/e500.c | 1 +
> hw/ppc/mac_newworld.c | 1 +
> hw/ppc/mac_oldworld.c | 1 +
> hw/ppc/ppc.c | 1 +
> hw/ppc/ppc_booke.c | 1 +
> hw/ppc/prep.c | 1 +
> hw/ppc/spapr_hcall.c | 1 +
> hw/ppc/spapr_ovec.c | 1 +
> hw/riscv/riscv-iommu-pci.c | 1 +
> hw/riscv/riscv-iommu.c | 1 +
> hw/s390x/s390-pci-bus.c | 1 +
> hw/s390x/s390-pci-inst.c | 1 +
> hw/s390x/s390-skeys.c | 1 +
> hw/sparc/sun4m.c | 1 +
> hw/sparc64/sun4u.c | 1 +
> hw/xtensa/pic_cpu.c | 1 +
> monitor/hmp-cmds-target.c | 1 +
> semihosting/uaccess.c | 2 +-
> target/alpha/helper.c | 2 +
> target/arm/gdbstub64.c | 1 +
> target/arm/helper.c | 6 ++
> target/arm/hvf/hvf.c | 1 +
> target/arm/ptw.c | 1 +
> target/arm/tcg/helper-a64.c | 1 +
> target/arm/tcg/hflags.c | 4 +-
> target/arm/tcg/mte_helper.c | 1 +
> target/arm/tcg/sve_helper.c | 1 +
> target/arm/tcg/tlb-insns.c | 1 +
> target/avr/helper.c | 2 +
> target/hexagon/translate.c | 1 +
> target/i386/arch_memory_mapping.c | 1 +
> target/i386/helper.c | 2 +
> target/i386/hvf/hvf.c | 1 +
> target/i386/kvm/hyperv.c | 1 +
> target/i386/kvm/kvm.c | 1 +
> target/i386/kvm/xen-emu.c | 1 +
> target/i386/sev.c | 1 +
> target/i386/tcg/system/excp_helper.c | 2 +
> target/i386/tcg/system/misc_helper.c | 1 +
> target/i386/tcg/system/tcg-cpu.c | 1 +
> target/i386/xsave_helper.c | 1 +
> target/loongarch/cpu_helper.c | 1 +
> target/loongarch/tcg/translate.c | 1 +
> target/m68k/helper.c | 1 +
> target/microblaze/helper.c | 1 +
> target/microblaze/mmu.c | 1 +
> target/mips/tcg/system/cp0_helper.c | 1 +
> target/mips/tcg/translate.c | 1 +
> target/openrisc/mmu.c | 1 +
> target/ppc/excp_helper.c | 1 +
> target/ppc/mmu-book3s-v3.c | 1 +
> target/ppc/mmu-hash64.c | 1 +
> target/ppc/mmu-radix64.c | 1 +
> target/riscv/cpu_helper.c | 1 +
> target/riscv/op_helper.c | 1 +
> target/riscv/pmp.c | 1 +
> target/riscv/vector_helper.c | 2 +
> target/rx/cpu.c | 1 +
> target/s390x/helper.c | 1 +
> target/s390x/ioinst.c | 1 +
> target/s390x/tcg/mem_helper.c | 1 +
> target/sparc/ldst_helper.c | 1 +
> target/sparc/mmu_helper.c | 2 +
> target/tricore/helper.c | 1 +
> target/xtensa/helper.c | 1 +
> target/xtensa/mmu_helper.c | 1 +
> target/xtensa/op_helper.c | 1 +
> target/xtensa/xtensa-semi.c | 1 +
> tcg/tcg-op-ldst.c | 2 +-
> hw/arm/meson.build | 117 ++++++++++++------------
> 133 files changed, 286 insertions(+), 169 deletions(-)
> rename include/exec/{cpu-all.h => tlb-flags.h} (84%)
>
Patches needing review:
- [PATCH v3 16/29] exec/target_page: runtime defintion for
TARGET_PAGE_BITS_MIN
- [PATCH v3 19/29] target/arm/cpu: always define kvm related registers
This patch concerning meson build system as well:
- [PATCH v3 23/29] meson: add common hw files
Regards,
Pierrick