[PATCH v3 00/29] cputlb: Remove support for MMU_MODE*_SUFFIX

Richard Henderson posted 29 patches 4 years, 3 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20191228231124.18307-1-richard.henderson@linaro.org
Test asan failed
Test checkpatch failed
Test FreeBSD failed
Test docker-mingw@fedora failed
Test docker-clang@ubuntu failed
Test docker-quick@centos7 failed
Maintainers: Aleksandar Markovic <amarkovic@wavecomp.com>, Cornelia Huck <cohuck@redhat.com>, Aurelien Jarno <aurelien@aurel32.net>, Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com>, Richard Henderson <rth@twiddle.net>, Paolo Bonzini <pbonzini@redhat.com>
accel/tcg/atomic_template.h               |  67 ++--
include/exec/cpu_ldst.h                   | 444 +++++++---------------
include/exec/cpu_ldst_template.h          | 211 ----------
include/exec/cpu_ldst_useronly_template.h | 159 --------
include/exec/translator.h                 |  48 +--
include/user/syscall-trace.h              |   2 +
target/alpha/cpu.h                        |   2 -
target/cris/cpu.h                         |   2 -
target/i386/cpu.h                         |   3 -
target/m68k/cpu.h                         |   2 -
target/microblaze/cpu.h                   |   3 -
target/mips/cpu.h                         |   4 -
target/nios2/cpu.h                        |   2 -
target/ppc/cpu.h                          |   2 -
target/s390x/cpu.h                        |   5 -
target/sh4/cpu.h                          |   2 -
target/unicore32/cpu.h                    |   2 -
target/xtensa/cpu.h                       |   4 -
tcg/tcg.h                                 |  29 --
trace/mem-internal.h                      |  17 -
accel/tcg/cputlb.c                        | 315 +++++++++++----
accel/tcg/tcg-runtime.c                   |   1 +
accel/tcg/user-exec.c                     | 236 ++++++++++++
linux-user/syscall.c                      |   1 +
plugins/api.c                             |   2 +
target/arm/sve_helper.c                   |   1 +
target/i386/seg_helper.c                  |  56 +--
target/m68k/op_helper.c                   |  77 ++--
target/mips/op_helper.c                   | 182 +++------
target/ppc/mem_helper.c                   |  11 +-
target/s390x/mem_helper.c                 |  11 +-
target/xtensa/mmu_helper.c                |   5 +-
docs/devel/loads-stores.rst               | 215 ++++++++---
33 files changed, 961 insertions(+), 1162 deletions(-)
delete mode 100644 include/exec/cpu_ldst_template.h
delete mode 100644 include/exec/cpu_ldst_useronly_template.h
[PATCH v3 00/29] cputlb: Remove support for MMU_MODE*_SUFFIX
Posted by Richard Henderson 4 years, 3 months ago
This is part of a project to raise the limit on NB_MMU_MODES.

One of those is in cpu_ldst.h, in support of MMU_MODE*_SUFFIX.
While this could be extended, it's not the best interface for
such things.  Better is a single interface that allows a variable
mmu_idx.  The best exemplars of that is the usage in target/mips
and target/ppc.

In the process, I tried to clean up the implementation of these
functions for softmmu and user-only.

Aleksander asked about code size changes.  They vary between
a minor size increase (e.g. for qemu-system-alpha, where there
are in fact no uses of the functions, which are now present as
out-of-line functions rather than eliminated inline functions),
to a minor size decrease (e.g. -79k/-1.6% for qemu-system-i386).
See below for details.

Changes for v3:
  * Add patch to avoid breaking build for --enable-plugins.
  * Rebase on master and resolve conflicts.

Changes for v2:
  * Significantly revised docs/devel/loads-stores.rst.
  * m68k and s390x dropped #defines and use *_mmuidx_ra directly.

Patches lacking review:
0009-plugins-Include-trace-mem.h-in-api.c.patch
0010-cputlb-Move-body-of-cpu_ldst_template.h-out-of-li.patch


r~


Cc: Aleksandar Markovic <amarkovic@wavecomp.com>
Cc: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Chris Wulff <crwulff@gmail.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: David Hildenbrand <david@redhat.com>
Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: Laurent Vivier <laurent@vivier.eu>
Cc: Marek Vasut <marex@denx.de>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>

Richard Henderson (29):
  target/xtensa: Use probe_access for itlb_hit_test
  cputlb: Use trace_mem_get_info instead of trace_mem_build_info
  trace: Remove trace_mem_build_info_no_se_[bl]e
  target/s390x: Include tcg.h in mem_helper.c
  target/arm: Include tcg.h in sve_helper.c
  accel/tcg: Include tcg.h in tcg-runtime.c
  linux-user: Include tcg.h in syscall.c
  linux-user: Include trace-root.h in syscall-trace.h
  plugins: Include trace/mem.h in api.c
  cputlb: Move body of cpu_ldst_template.h out of line
  translator: Use cpu_ld*_code instead of open-coding
  cputlb: Rename helper_ret_ld*_cmmu to cpu_ld*_code
  cputlb: Provide cpu_(ld,st}*_mmuidx_ra for user-only
  target/i386: Use cpu_*_mmuidx_ra instead of templates
  cputlb: Expand cpu_ldst_useronly_template.h in user-exec.c
  target/nios2: Remove MMU_MODE{0,1}_SUFFIX
  target/alpha: Remove MMU_MODE{0,1}_SUFFIX
  target/cris: Remove MMU_MODE{0,1}_SUFFIX
  target/i386: Remove MMU_MODE{0,1,2}_SUFFIX
  target/microblaze: Remove MMU_MODE{0,1,2}_SUFFIX
  target/sh4: Remove MMU_MODE{0,1}_SUFFIX
  target/unicore32: Remove MMU_MODE{0,1}_SUFFIX
  target/xtensa: Remove MMU_MODE{0,1,2,3}_SUFFIX
  target/m68k: Use cpu_*_mmuidx_ra instead of MMU_MODE{0,1}_SUFFIX
  target/mips: Use cpu_*_mmuidx_ra instead of MMU_MODE*_SUFFIX
  target/s390x: Use cpu_*_mmuidx_ra instead of MMU_MODE*_SUFFIX
  target/ppc: Use cpu_*_mmuidx_ra instead of MMU_MODE*_SUFFIX
  cputlb: Remove support for MMU_MODE*_SUFFIX
  cputlb: Expand cpu_ldst_template.h in cputlb.c

 accel/tcg/atomic_template.h               |  67 ++--
 include/exec/cpu_ldst.h                   | 444 +++++++---------------
 include/exec/cpu_ldst_template.h          | 211 ----------
 include/exec/cpu_ldst_useronly_template.h | 159 --------
 include/exec/translator.h                 |  48 +--
 include/user/syscall-trace.h              |   2 +
 target/alpha/cpu.h                        |   2 -
 target/cris/cpu.h                         |   2 -
 target/i386/cpu.h                         |   3 -
 target/m68k/cpu.h                         |   2 -
 target/microblaze/cpu.h                   |   3 -
 target/mips/cpu.h                         |   4 -
 target/nios2/cpu.h                        |   2 -
 target/ppc/cpu.h                          |   2 -
 target/s390x/cpu.h                        |   5 -
 target/sh4/cpu.h                          |   2 -
 target/unicore32/cpu.h                    |   2 -
 target/xtensa/cpu.h                       |   4 -
 tcg/tcg.h                                 |  29 --
 trace/mem-internal.h                      |  17 -
 accel/tcg/cputlb.c                        | 315 +++++++++++----
 accel/tcg/tcg-runtime.c                   |   1 +
 accel/tcg/user-exec.c                     | 236 ++++++++++++
 linux-user/syscall.c                      |   1 +
 plugins/api.c                             |   2 +
 target/arm/sve_helper.c                   |   1 +
 target/i386/seg_helper.c                  |  56 +--
 target/m68k/op_helper.c                   |  77 ++--
 target/mips/op_helper.c                   | 182 +++------
 target/ppc/mem_helper.c                   |  11 +-
 target/s390x/mem_helper.c                 |  11 +-
 target/xtensa/mmu_helper.c                |   5 +-
 docs/devel/loads-stores.rst               | 215 ++++++++---
 33 files changed, 961 insertions(+), 1162 deletions(-)
 delete mode 100644 include/exec/cpu_ldst_template.h
 delete mode 100644 include/exec/cpu_ldst_useronly_template.h

-- 
2.20.1


Re: [PATCH v3 00/29] cputlb: Remove support for MMU_MODE*_SUFFIX
Posted by Philippe Mathieu-Daudé 4 years, 3 months ago
On 12/29/19 12:10 AM, Richard Henderson wrote:
> This is part of a project to raise the limit on NB_MMU_MODES.
> 
> One of those is in cpu_ldst.h, in support of MMU_MODE*_SUFFIX.
> While this could be extended, it's not the best interface for
> such things.  Better is a single interface that allows a variable
> mmu_idx.  The best exemplars of that is the usage in target/mips
> and target/ppc.
> 
> In the process, I tried to clean up the implementation of these
> functions for softmmu and user-only.
> 
> Aleksander asked about code size changes.  They vary between
> a minor size increase (e.g. for qemu-system-alpha, where there
> are in fact no uses of the functions, which are now present as
> out-of-line functions rather than eliminated inline functions),
> to a minor size decrease (e.g. -79k/-1.6% for qemu-system-i386).
> See below for details.
> 
> Changes for v3:
>    * Add patch to avoid breaking build for --enable-plugins.
>    * Rebase on master and resolve conflicts.
> 
> Changes for v2:
>    * Significantly revised docs/devel/loads-stores.rst.
>    * m68k and s390x dropped #defines and use *_mmuidx_ra directly.
> 
> Patches lacking review:
> 0009-plugins-Include-trace-mem.h-in-api.c.patch
> 0010-cputlb-Move-body-of-cpu_ldst_template.h-out-of-li.patch
> 
> 
> r~
> 
> 
> Cc: Aleksandar Markovic <amarkovic@wavecomp.com>
> Cc: Aleksandar Rikalo <aleksandar.rikalo@rt-rk.com>
> Cc: Aurelien Jarno <aurelien@aurel32.net>
> Cc: Chris Wulff <crwulff@gmail.com>
> Cc: David Gibson <david@gibson.dropbear.id.au>
> Cc: David Hildenbrand <david@redhat.com>
> Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com>
> Cc: Eduardo Habkost <ehabkost@redhat.com>
> Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
> Cc: Laurent Vivier <laurent@vivier.eu>
> Cc: Marek Vasut <marex@denx.de>
> Cc: Max Filippov <jcmvbkbc@gmail.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Peter Maydell <peter.maydell@linaro.org>
> 
> Richard Henderson (29):
>    target/xtensa: Use probe_access for itlb_hit_test
>    cputlb: Use trace_mem_get_info instead of trace_mem_build_info
>    trace: Remove trace_mem_build_info_no_se_[bl]e
>    target/s390x: Include tcg.h in mem_helper.c
>    target/arm: Include tcg.h in sve_helper.c
>    accel/tcg: Include tcg.h in tcg-runtime.c
>    linux-user: Include tcg.h in syscall.c
>    linux-user: Include trace-root.h in syscall-trace.h
>    plugins: Include trace/mem.h in api.c
>    cputlb: Move body of cpu_ldst_template.h out of line
>    translator: Use cpu_ld*_code instead of open-coding
>    cputlb: Rename helper_ret_ld*_cmmu to cpu_ld*_code
>    cputlb: Provide cpu_(ld,st}*_mmuidx_ra for user-only
>    target/i386: Use cpu_*_mmuidx_ra instead of templates
>    cputlb: Expand cpu_ldst_useronly_template.h in user-exec.c
>    target/nios2: Remove MMU_MODE{0,1}_SUFFIX
>    target/alpha: Remove MMU_MODE{0,1}_SUFFIX
>    target/cris: Remove MMU_MODE{0,1}_SUFFIX
>    target/i386: Remove MMU_MODE{0,1,2}_SUFFIX
>    target/microblaze: Remove MMU_MODE{0,1,2}_SUFFIX
>    target/sh4: Remove MMU_MODE{0,1}_SUFFIX
>    target/unicore32: Remove MMU_MODE{0,1}_SUFFIX
>    target/xtensa: Remove MMU_MODE{0,1,2,3}_SUFFIX
>    target/m68k: Use cpu_*_mmuidx_ra instead of MMU_MODE{0,1}_SUFFIX
>    target/mips: Use cpu_*_mmuidx_ra instead of MMU_MODE*_SUFFIX
>    target/s390x: Use cpu_*_mmuidx_ra instead of MMU_MODE*_SUFFIX
>    target/ppc: Use cpu_*_mmuidx_ra instead of MMU_MODE*_SUFFIX
>    cputlb: Remove support for MMU_MODE*_SUFFIX
>    cputlb: Expand cpu_ldst_template.h in cputlb.c

Series:
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>