From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: Richard Henderson <richard.henderson@linaro.org>, qemu-devel@nongnu.org
Subject: Re: [PATCH v3 24/48] tcg: Split helper-proto.h
Date: Fri, 2 Jun 2023 23:14:59 +0200 [thread overview]
Message-ID: <b1f6be3c-a275-8e3a-63e5-a9a7d804749a@linaro.org> (raw)
In-Reply-To: <20230531040330.8950-25-richard.henderson@linaro.org>
On 31/5/23 06:03, Richard Henderson wrote:
> Create helper-proto-common.h without the target specific portion.
> Use that in tcg-op-common.h. Include helper-proto.h in target/arm
> and target/hexagon before helper-info.c.inc; all other targets are
> already correct in this regard.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> include/exec/helper-proto-common.h | 17 +++++++
> include/exec/helper-proto.h | 72 ++++--------------------------
> include/tcg/tcg-op-common.h | 2 +-
> include/exec/helper-proto.h.inc | 67 +++++++++++++++++++++++++++
> accel/tcg/cputlb.c | 3 +-
> accel/tcg/plugin-gen.c | 2 +-
> accel/tcg/tcg-runtime-gvec.c | 2 +-
> accel/tcg/tcg-runtime.c | 2 +-
> target/arm/tcg/translate.c | 1 +
> target/hexagon/translate.c | 1 +
> 10 files changed, 99 insertions(+), 70 deletions(-)
> create mode 100644 include/exec/helper-proto-common.h
> create mode 100644 include/exec/helper-proto.h.inc
> diff --git a/include/exec/helper-proto.h.inc b/include/exec/helper-proto.h.inc
> new file mode 100644
> index 0000000000..f6f0cfcacd
> --- /dev/null
> +++ b/include/exec/helper-proto.h.inc
> @@ -0,0 +1,67 @@
> +/*
> + * Helper file for declaring TCG helper functions.
> + * This one expands prototypes for the helper functions.
> + * Define HELPER_H for the header file to be expanded.
> + */
> +
> +#include "exec/helper-head.h"
> +
> +/*
> + * Work around an issue with --enable-lto, in which GCC's ipa-split pass
> + * decides to split out the noreturn code paths that raise an exception,
> + * taking the __builtin_return_address() along into the new function,
> + * where it no longer computes a value that returns to TCG generated code.
> + * Despite the name, the noinline attribute affects splitter, so this
> + * prevents the optimization in question. Given that helpers should not
> + * otherwise be called directly, this should have any other visible effect.
> + *
> + * See https://gitlab.com/qemu-project/qemu/-/issues/1454
> + */
> +#define DEF_HELPER_ATTR __attribute__((noinline))
> +
> +#define DEF_HELPER_FLAGS_0(name, flags, ret) \
> +dh_ctype(ret) HELPER(name) (void) DEF_HELPER_ATTR;
> +
> +#define DEF_HELPER_FLAGS_1(name, flags, ret, t1) \
> +dh_ctype(ret) HELPER(name) (dh_ctype(t1)) DEF_HELPER_ATTR;
> +
> +#define DEF_HELPER_FLAGS_2(name, flags, ret, t1, t2) \
> +dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2)) DEF_HELPER_ATTR;
> +
> +#define DEF_HELPER_FLAGS_3(name, flags, ret, t1, t2, t3) \
> +dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), \
> + dh_ctype(t3)) DEF_HELPER_ATTR;
> +
> +#define DEF_HELPER_FLAGS_4(name, flags, ret, t1, t2, t3, t4) \
> +dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), dh_ctype(t3), \
> + dh_ctype(t4)) DEF_HELPER_ATTR;
> +
> +#define DEF_HELPER_FLAGS_5(name, flags, ret, t1, t2, t3, t4, t5) \
> +dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), dh_ctype(t3), \
> + dh_ctype(t4), dh_ctype(t5)) DEF_HELPER_ATTR;
> +
> +#define DEF_HELPER_FLAGS_6(name, flags, ret, t1, t2, t3, t4, t5, t6) \
> +dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), dh_ctype(t3), \
> + dh_ctype(t4), dh_ctype(t5), \
> + dh_ctype(t6)) DEF_HELPER_ATTR;
> +
> +#define DEF_HELPER_FLAGS_7(name, flags, ret, t1, t2, t3, t4, t5, t6, t7) \
> +dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), dh_ctype(t3), \
> + dh_ctype(t4), dh_ctype(t5), dh_ctype(t6), \
> + dh_ctype(t7)) DEF_HELPER_ATTR;
> +
> +#define IN_HELPER_PROTO
> +
> +#include HELPER_H
> +
> +#undef IN_HELPER_PROTO
> +
> +#undef DEF_HELPER_FLAGS_0
> +#undef DEF_HELPER_FLAGS_1
> +#undef DEF_HELPER_FLAGS_2
> +#undef DEF_HELPER_FLAGS_3
> +#undef DEF_HELPER_FLAGS_4
> +#undef DEF_HELPER_FLAGS_5
> +#undef DEF_HELPER_FLAGS_6
> +#undef DEF_HELPER_FLAGS_7
> +#undef DEF_HELPER_ATTR
Should we guard this header for multiple inclusions?
Otherwise:
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
next prev parent reply other threads:[~2023-06-02 21:15 UTC|newest]
Thread overview: 105+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-31 4:02 [PATCH v3 00/48] tcg: Build once for system, once for user Richard Henderson
2023-05-31 4:02 ` [PATCH v3 01/48] tcg/ppc: Remove TARGET_LONG_BITS, TCG_TYPE_TL Richard Henderson
2023-06-04 10:32 ` Anton Johansson via
2023-05-31 4:02 ` [PATCH v3 02/48] tcg/riscv: " Richard Henderson
2023-05-31 14:11 ` Philippe Mathieu-Daudé
2023-05-31 4:02 ` [PATCH v3 03/48] tcg/s390x: " Richard Henderson
2023-05-31 14:11 ` Philippe Mathieu-Daudé
2023-05-31 4:02 ` [PATCH v3 04/48] tcg/sparc64: " Richard Henderson
2023-05-31 14:12 ` Philippe Mathieu-Daudé
2023-05-31 4:02 ` [PATCH v3 05/48] tcg: Move TCG_TYPE_TL from tcg.h to tcg-op.h Richard Henderson
2023-05-31 4:02 ` [PATCH v3 06/48] tcg: Widen CPUTLBEntry comparators to 64-bits Richard Henderson
2023-06-02 11:33 ` Anton Johansson via
2023-05-31 4:02 ` [PATCH v3 07/48] tcg: Add tlb_fast_offset to TCGContext Richard Henderson
2023-06-01 11:11 ` Philippe Mathieu-Daudé
2023-05-31 4:02 ` [PATCH v3 08/48] *: Add missing includes of qemu/error-report.h Richard Henderson
2023-06-01 11:12 ` Philippe Mathieu-Daudé
2023-05-31 4:02 ` [PATCH v3 09/48] *: Add missing includes of tcg/debug-assert.h Richard Henderson
2023-06-01 11:19 ` Philippe Mathieu-Daudé
2023-05-31 4:02 ` [PATCH v3 10/48] *: Add missing includes of tcg/tcg.h Richard Henderson
2023-05-31 4:02 ` [PATCH v3 11/48] tcg: Split out tcg-target-reg-bits.h Richard Henderson
2023-05-31 14:04 ` Philippe Mathieu-Daudé
2023-05-31 4:02 ` [PATCH v3 12/48] target/arm: Fix test of TCG_OVERSIZED_GUEST Richard Henderson
2023-06-01 20:13 ` Philippe Mathieu-Daudé
2023-05-31 4:02 ` [PATCH v3 13/48] tcg: Split out tcg/oversized-guest.h Richard Henderson
2023-05-31 4:02 ` [PATCH v3 14/48] tcg: Move TCGv, dup_const_tl definitions to tcg-op.h Richard Henderson
2023-06-01 11:13 ` Philippe Mathieu-Daudé
2023-05-31 4:02 ` [PATCH v3 15/48] tcg: Split tcg/tcg-op-common.h from tcg/tcg-op.h Richard Henderson
2023-06-02 21:29 ` Philippe Mathieu-Daudé
2023-06-03 4:04 ` Richard Henderson
2023-06-03 13:33 ` Philippe Mathieu-Daudé
2023-05-31 4:02 ` [PATCH v3 16/48] target/arm: Include helper-gen.h in translator.h Richard Henderson
2023-05-31 14:13 ` Philippe Mathieu-Daudé
2023-05-31 4:02 ` [PATCH v3 17/48] target/hexagon: Include helper-gen.h where needed Richard Henderson
2023-05-31 14:13 ` Philippe Mathieu-Daudé
2023-05-31 4:03 ` [PATCH v3 18/48] tcg: Remove outdated comments in helper-head.h Richard Henderson
2023-06-01 20:14 ` Philippe Mathieu-Daudé
2023-05-31 4:03 ` [PATCH v3 19/48] tcg: Move TCGHelperInfo and dependencies to tcg/helper-info.h Richard Henderson
2023-05-31 14:14 ` Philippe Mathieu-Daudé
2023-05-31 4:03 ` [PATCH v3 20/48] tcg: Pass TCGHelperInfo to tcg_gen_callN Richard Henderson
2023-06-04 11:19 ` Anton Johansson via
2023-05-31 4:03 ` [PATCH v3 21/48] tcg: Move temp_idx and tcgv_i32_temp debug out of line Richard Henderson
2023-06-01 20:18 ` Philippe Mathieu-Daudé
2023-05-31 4:03 ` [PATCH v3 22/48] tcg: Split tcg_gen_callN Richard Henderson
2023-06-02 21:19 ` Philippe Mathieu-Daudé
2023-05-31 4:03 ` [PATCH v3 23/48] tcg: Split helper-gen.h Richard Henderson
2023-06-02 21:17 ` Philippe Mathieu-Daudé
2023-06-03 4:09 ` Richard Henderson
2023-06-03 13:34 ` Philippe Mathieu-Daudé
2023-05-31 4:03 ` [PATCH v3 24/48] tcg: Split helper-proto.h Richard Henderson
2023-06-02 21:14 ` Philippe Mathieu-Daudé [this message]
2023-06-03 4:10 ` Richard Henderson
2023-05-31 4:03 ` [PATCH v3 25/48] tcg: Add insn_start_words to TCGContext Richard Henderson
2023-06-04 11:43 ` Anton Johansson via
2023-05-31 4:03 ` [PATCH v3 26/48] tcg: Add guest_mo " Richard Henderson
2023-06-01 11:14 ` Philippe Mathieu-Daudé
2023-05-31 4:03 ` [PATCH v3 27/48] tcg: Move TLB_FLAGS_MASK check out of get_alignment_bits Richard Henderson
2023-06-04 11:57 ` Anton Johansson via
2023-05-31 4:03 ` [PATCH v3 28/48] tcg: Split tcg/tcg-op-gvec.h Richard Henderson
2023-06-01 20:21 ` Philippe Mathieu-Daudé
2023-05-31 4:03 ` [PATCH v3 29/48] tcg: Remove NO_CPU_IO_DEFS Richard Henderson
2023-05-31 5:19 ` Philippe Mathieu-Daudé
2023-05-31 4:03 ` [PATCH v3 30/48] exec-all: Widen tb_page_addr_t for user-only Richard Henderson
2023-06-02 10:02 ` Philippe Mathieu-Daudé
2023-06-03 4:14 ` Richard Henderson
2023-05-31 4:03 ` [PATCH v3 31/48] exec-all: Widen TranslationBlock pc and cs_base to 64-bits Richard Henderson
2023-05-31 4:03 ` [PATCH v3 32/48] tcg: Spit out exec/translation-block.h Richard Henderson
2023-06-01 20:23 ` Philippe Mathieu-Daudé
2023-05-31 4:03 ` [PATCH v3 33/48] include/exec: Remove CODE_GEN_AVG_BLOCK_SIZE Richard Henderson
2023-06-02 9:34 ` Philippe Mathieu-Daudé
2023-05-31 4:03 ` [PATCH v3 34/48] accel/tcg: Move most of gen-icount.h into translator.c Richard Henderson
2023-05-31 5:21 ` Philippe Mathieu-Daudé
2023-05-31 4:03 ` [PATCH v3 35/48] accel/tcg: Introduce translator_io_start Richard Henderson
2023-06-02 9:45 ` Philippe Mathieu-Daudé
2023-06-02 9:54 ` [PATCH 35.5] target/pcc: Inline gen_icount_io_start() Philippe Mathieu-Daudé
2023-06-03 4:30 ` Richard Henderson
2023-05-31 4:03 ` [PATCH v3 36/48] accel/tcg: Move translator_fake_ldb out of line Richard Henderson
2023-06-02 10:06 ` Philippe Mathieu-Daudé
2023-05-31 4:03 ` [PATCH v3 37/48] target/arm: Tidy helpers for translation Richard Henderson
2023-05-31 5:23 ` Philippe Mathieu-Daudé
2023-05-31 4:03 ` [PATCH v3 38/48] target/mips: " Richard Henderson
2023-05-31 5:24 ` Philippe Mathieu-Daudé
2023-05-31 4:03 ` [PATCH v3 39/48] *: Add missing includes of exec/translation-block.h Richard Henderson
2023-06-02 21:02 ` Philippe Mathieu-Daudé
2023-05-31 4:03 ` [PATCH v3 40/48] *: Add missing includes of exec/exec-all.h Richard Henderson
2023-06-02 21:02 ` Philippe Mathieu-Daudé
2023-05-31 4:03 ` [PATCH v3 41/48] accel/tcg: Tidy includes for translator.[ch] Richard Henderson
2023-06-02 20:59 ` Philippe Mathieu-Daudé
2023-05-31 4:03 ` [PATCH v3 42/48] tcg: Fix PAGE/PROT confusion Richard Henderson
2023-06-02 20:59 ` Philippe Mathieu-Daudé
2023-05-31 4:03 ` [PATCH v3 43/48] tcg: Move env defines out of NEED_CPU_H in helper-head.h Richard Henderson
2023-05-31 5:26 ` Philippe Mathieu-Daudé
2023-05-31 4:03 ` [PATCH v3 44/48] tcg: Remove target-specific headers from tcg.[ch] Richard Henderson
2023-05-31 5:27 ` Philippe Mathieu-Daudé
2023-05-31 4:03 ` [PATCH v3 45/48] plugins: Move plugin_insn_append to translator.c Richard Henderson
2023-06-02 21:00 ` Philippe Mathieu-Daudé
2023-05-31 4:03 ` [PATCH v3 46/48] plugins: Drop unused headers from exec/plugin-gen.h Richard Henderson
2023-06-02 21:01 ` Philippe Mathieu-Daudé
2023-05-31 4:03 ` [PATCH v3 47/48] exec/poison: Do not poison CONFIG_SOFTMMU Richard Henderson
2023-06-02 23:15 ` Philippe Mathieu-Daudé
2023-05-31 4:03 ` [PATCH v3 48/48] tcg: Build once for system and once for user-only Richard Henderson
2023-05-31 5:30 ` Philippe Mathieu-Daudé
2023-06-02 21:25 ` [PATCH v3 00/48] tcg: Build once for system, once for user Philippe Mathieu-Daudé
2023-06-03 4:34 ` Richard Henderson
2023-06-03 13:38 ` Philippe Mathieu-Daudé
2023-06-04 1:40 ` Richard Henderson
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=b1f6be3c-a275-8e3a-63e5-a9a7d804749a@linaro.org \
--to=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/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).