From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PATCH v2 25/52] tcg: Split helper-proto.h
Date: Tue, 23 May 2023 06:52:55 -0700 [thread overview]
Message-ID: <20230523135322.678948-26-richard.henderson@linaro.org> (raw)
In-Reply-To: <20230523135322.678948-1-richard.henderson@linaro.org>
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 +-
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 +
include/exec/helper-proto.h.inc | 67 +++++++++++++++++++++++++++
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-common.h b/include/exec/helper-proto-common.h
new file mode 100644
index 0000000000..666778473e
--- /dev/null
+++ b/include/exec/helper-proto-common.h
@@ -0,0 +1,17 @@
+/*
+ * Helper file for declaring TCG helper functions.
+ * This one expands prototypes for the helper functions.
+ */
+
+#ifndef HELPER_PROTO_COMMON_H
+#define HELPER_PROTO_COMMON_H
+
+#define HELPER_H "accel/tcg/tcg-runtime.h"
+#include "exec/helper-proto.h.inc"
+#undef HELPER_H
+
+#define HELPER_H "accel/tcg/plugin-helpers.h"
+#include "exec/helper-proto.h.inc"
+#undef HELPER_H
+
+#endif /* HELPER_PROTO_COMMON_H */
diff --git a/include/exec/helper-proto.h b/include/exec/helper-proto.h
index 7a3f04b58c..aac684dbbf 100644
--- a/include/exec/helper-proto.h
+++ b/include/exec/helper-proto.h
@@ -1,71 +1,15 @@
-/* Helper file for declaring TCG helper functions.
- This one expands prototypes for the helper functions. */
+/*
+ * Helper file for declaring TCG helper functions.
+ * This one expands prototypes for the helper functions.
+ */
#ifndef HELPER_PROTO_H
#define HELPER_PROTO_H
-#include "exec/helper-head.h"
+#include "exec/helper-proto-common.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"
-#include "accel/tcg/tcg-runtime.h"
-#include "accel/tcg/plugin-helpers.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
+#define HELPER_H "helper.h"
+#include "exec/helper-proto.h.inc"
+#undef HELPER_H
#endif /* HELPER_PROTO_H */
diff --git a/include/tcg/tcg-op-common.h b/include/tcg/tcg-op-common.h
index f6f05469c5..be382bbf77 100644
--- a/include/tcg/tcg-op-common.h
+++ b/include/tcg/tcg-op-common.h
@@ -9,7 +9,7 @@
#define TCG_TCG_OP_COMMON_H
#include "tcg/tcg.h"
-#include "exec/helper-proto.h"
+#include "exec/helper-proto-common.h"
#include "exec/helper-gen-common.h"
/* Basic output routines. Not for general consumption. */
diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index 32a4817139..5e2ca47243 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -29,7 +29,7 @@
#include "tcg/tcg.h"
#include "qemu/error-report.h"
#include "exec/log.h"
-#include "exec/helper-proto.h"
+#include "exec/helper-proto-common.h"
#include "qemu/atomic.h"
#include "qemu/atomic128.h"
#include "exec/translate-all.h"
@@ -41,7 +41,6 @@
#endif
#include "tcg/tcg-ldst.h"
#include "tcg/oversized-guest.h"
-#include "exec/helper-proto.h"
/* DEBUG defines, enable DEBUG_TLB_LOG to log to the CPU_LOG_MMU target */
/* #define DEBUG_TLB */
diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c
index 40b34a0403..3e528f191d 100644
--- a/accel/tcg/plugin-gen.c
+++ b/accel/tcg/plugin-gen.c
@@ -49,7 +49,7 @@
#include "exec/exec-all.h"
#include "exec/plugin-gen.h"
#include "exec/translator.h"
-#include "exec/helper-proto.h"
+#include "exec/helper-proto-common.h"
#define HELPER_H "accel/tcg/plugin-helpers.h"
#include "exec/helper-info.c.inc"
diff --git a/accel/tcg/tcg-runtime-gvec.c b/accel/tcg/tcg-runtime-gvec.c
index 97399493d5..6c99f952ca 100644
--- a/accel/tcg/tcg-runtime-gvec.c
+++ b/accel/tcg/tcg-runtime-gvec.c
@@ -20,7 +20,7 @@
#include "qemu/osdep.h"
#include "qemu/host-utils.h"
#include "cpu.h"
-#include "exec/helper-proto.h"
+#include "exec/helper-proto-common.h"
#include "tcg/tcg-gvec-desc.h"
diff --git a/accel/tcg/tcg-runtime.c b/accel/tcg/tcg-runtime.c
index 14b59a36e5..9fa539ad3d 100644
--- a/accel/tcg/tcg-runtime.c
+++ b/accel/tcg/tcg-runtime.c
@@ -24,7 +24,7 @@
#include "qemu/osdep.h"
#include "qemu/host-utils.h"
#include "cpu.h"
-#include "exec/helper-proto.h"
+#include "exec/helper-proto-common.h"
#include "exec/cpu_ldst.h"
#include "exec/exec-all.h"
#include "disas/disas.h"
diff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c
index ce50531dff..379f266256 100644
--- a/target/arm/tcg/translate.c
+++ b/target/arm/tcg/translate.c
@@ -35,6 +35,7 @@
#include "translate.h"
#include "translate-a32.h"
#include "exec/gen-icount.h"
+#include "exec/helper-proto.h"
#define HELPER_H "helper.h"
#include "exec/helper-info.c.inc"
diff --git a/target/hexagon/translate.c b/target/hexagon/translate.c
index 370dbbaa77..eda384a9db 100644
--- a/target/hexagon/translate.c
+++ b/target/hexagon/translate.c
@@ -21,6 +21,7 @@
#include "tcg/tcg-op.h"
#include "tcg/tcg-op-gvec.h"
#include "exec/helper-gen.h"
+#include "exec/helper-proto.h"
#include "exec/cpu_ldst.h"
#include "exec/log.h"
#include "internal.h"
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
--
2.34.1
next prev parent reply other threads:[~2023-05-23 14:08 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-23 13:52 [PATCH v2 00/52] tcg: Build once for system, once for user Richard Henderson
2023-05-23 13:52 ` [PATCH v2 01/52] tcg/ppc: Remove TARGET_LONG_BITS, TCG_TYPE_TL Richard Henderson
2023-05-23 13:52 ` [PATCH v2 02/52] tcg/riscv: " Richard Henderson
2023-05-23 13:52 ` [PATCH v2 03/52] tcg/s390x: " Richard Henderson
2023-05-23 13:52 ` [PATCH v2 04/52] tcg/sparc64: " Richard Henderson
2023-05-23 13:52 ` [PATCH v2 05/52] tcg: Move TCG_TYPE_TL from tcg.h to tcg-op.h Richard Henderson
2023-05-23 16:28 ` Philippe Mathieu-Daudé
2023-05-23 13:52 ` [PATCH v2 06/52] tcg: Widen CPUTLBEntry comparators to 64-bits Richard Henderson
2023-05-23 13:52 ` [PATCH v2 07/52] tcg: Add tlb_fast_offset to TCGContext Richard Henderson
2023-05-23 13:52 ` [PATCH v2 08/52] tcg: Remove TCG_TARGET_TLB_DISPLACEMENT_BITS Richard Henderson
2023-05-23 16:29 ` Philippe Mathieu-Daudé
2023-05-23 13:52 ` [PATCH v2 09/52] *: Add missing includes of qemu/error-report.h Richard Henderson
2023-05-23 13:52 ` [PATCH v2 10/52] *: Add missing includes of tcg/debug-assert.h Richard Henderson
2023-05-23 13:52 ` [PATCH v2 11/52] *: Add missing includes of tcg/tcg.h Richard Henderson
2023-05-23 16:31 ` Philippe Mathieu-Daudé
2023-05-23 13:52 ` [PATCH v2 12/52] tcg: Split out tcg-target-reg-bits.h Richard Henderson
2023-05-23 13:52 ` [PATCH v2 13/52] target/arm: Fix test of TCG_OVERSIZED_GUEST Richard Henderson
2023-05-23 13:52 ` [PATCH v2 14/52] tcg: Split out tcg/oversized-guest.h Richard Henderson
2023-05-23 16:33 ` Philippe Mathieu-Daudé
2023-05-23 13:52 ` [PATCH v2 15/52] tcg: Move TCGv, dup_const_tl definitions to tcg-op.h Richard Henderson
2023-05-23 13:52 ` [PATCH v2 16/52] tcg: Split tcg/tcg-op-common.h from tcg/tcg-op.h Richard Henderson
2023-05-23 13:52 ` [PATCH v2 17/52] target/arm: Include helper-gen.h in translator.h Richard Henderson
2023-05-23 13:52 ` [PATCH v2 18/52] target/hexagon: Include helper-gen.h where needed Richard Henderson
2023-05-23 13:52 ` [PATCH v2 19/52] tcg: Remove outdated comments in helper-head.h Richard Henderson
2023-05-23 13:52 ` [PATCH v2 20/52] tcg: Move TCGHelperInfo and dependencies to tcg/helper-info.h Richard Henderson
2023-05-23 13:52 ` [PATCH v2 21/52] tcg: Pass TCGHelperInfo to tcg_gen_callN Richard Henderson
2023-05-23 13:52 ` [PATCH v2 22/52] tcg: Move temp_idx and tcgv_i32_temp debug out of line Richard Henderson
2023-05-23 13:52 ` [PATCH v2 23/52] tcg: Split tcg_gen_callN Richard Henderson
2023-05-23 13:52 ` [PATCH v2 24/52] tcg: Split helper-gen.h Richard Henderson
2023-05-23 13:52 ` Richard Henderson [this message]
2023-05-23 13:52 ` [PATCH v2 26/52] tcg: Add insn_start_words to TCGContext Richard Henderson
2023-05-23 13:52 ` [PATCH v2 27/52] tcg: Add guest_mo " Richard Henderson
2023-05-23 13:52 ` [PATCH v2 28/52] tcg: Move TLB_FLAGS_MASK check out of get_alignment_bits Richard Henderson
2023-05-23 13:52 ` [PATCH v2 29/52] tcg: Split tcg/tcg-op-gvec.h Richard Henderson
2023-05-23 13:53 ` [PATCH v2 30/52] tcg: Remove NO_CPU_IO_DEFS Richard Henderson
2023-05-23 13:53 ` [PATCH v2 31/52] exec-all: Widen tb_page_addr_t for user-only Richard Henderson
2023-05-23 13:53 ` [PATCH v2 32/52] exec-all: Widen TranslationBlock pc and cs_base to 64-bits Richard Henderson
2023-05-23 16:36 ` Philippe Mathieu-Daudé
2023-05-23 13:53 ` [PATCH v2 33/52] tcg: Remove DEBUG_DISAS Richard Henderson
2023-05-23 16:37 ` Philippe Mathieu-Daudé
2023-05-23 13:53 ` [PATCH v2 34/52] tcg: Remove USE_TCG_OPTIMIZATIONS Richard Henderson
2023-05-23 16:37 ` Philippe Mathieu-Daudé
2023-05-23 13:53 ` [PATCH v2 35/52] tcg: Spit out exec/translation-block.h Richard Henderson
2023-05-23 13:53 ` [PATCH v2 36/52] include/exec: Remove CODE_GEN_AVG_BLOCK_SIZE Richard Henderson
2023-05-23 13:53 ` [PATCH v2 37/52] accel/tcg: Move most of gen-icount.h into translator.c Richard Henderson
2023-05-23 13:53 ` [PATCH v2 38/52] accel/tcg: Introduce translator_io_start Richard Henderson
2023-05-23 13:53 ` [PATCH v2 39/52] accel/tcg: Move translator_fake_ldb out of line Richard Henderson
2023-05-23 13:53 ` [PATCH v2 40/52] target/arm: Tidy helpers for translation Richard Henderson
2023-05-23 13:53 ` [PATCH v2 41/52] target/mips: " Richard Henderson
2023-05-23 13:53 ` [PATCH v2 42/52] *: Add missing includes of exec/translation-block.h Richard Henderson
2023-05-23 13:53 ` [PATCH v2 43/52] *: Add missing includes of exec/exec-all.h Richard Henderson
2023-05-23 13:53 ` [PATCH v2 44/52] accel/tcg: Tidy includes for translator.[ch] Richard Henderson
2023-05-23 13:53 ` [PATCH v2 45/52] tcg: Define IN_TCG Richard Henderson
2023-05-23 16:45 ` Philippe Mathieu-Daudé
2023-05-23 16:50 ` Philippe Mathieu-Daudé
2023-05-24 0:26 ` Richard Henderson
2023-05-23 13:53 ` [PATCH v2 46/52] tcg: Fix PAGE/PROT confusion Richard Henderson
2023-05-23 13:53 ` [PATCH v2 47/52] tcg: Move env defines out of NEED_CPU_H in helper-head.h Richard Henderson
2023-05-23 13:53 ` [PATCH v2 48/52] tcg: Remove target-specific headers from tcg.[ch] Richard Henderson
2023-05-23 13:53 ` [PATCH v2 49/52] plugins: Move plugin_insn_append to translator.c Richard Henderson
2023-05-23 13:53 ` [PATCH v2 50/52] plugins: Drop unused headers from exec/plugin-gen.h Richard Henderson
2023-05-23 13:53 ` [PATCH v2 51/52] exec/poison: Do not poison CONFIG_SOFTMMU Richard Henderson
2023-05-23 13:53 ` [PATCH v2 52/52] tcg: Build once for system and once for user-only 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=20230523135322.678948-26-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=qemu-devel@nongnu.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).