[PULL 0/4] tcg patch queue
[PULL v2 00/34] tcg patch queue
1
Pretty small still, but there are two patches that ought
1
For version 2, drop the -static and -pie changes,
2
to get backported to stable, so no point in delaying.
2
i.e. patches 1-7 from version 1.
3
4
I'll come back to those after the required linux-user changes are
5
upstream. In the meantime, it's still a large enough set of patches.
6
3
7
4
r~
8
r~
5
9
6
The following changes since commit a5ba0a7e4e150d1350a041f0d0ef9ca6c8d7c307:
7
10
8
Merge tag 'pull-aspeed-20241211' of https://github.com/legoater/qemu into staging (2024-12-11 15:16:47 +0000)
11
12
The following changes since commit 3a63b24a1bbf166e6f455fe43a6bbd8dea413d92:
13
14
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20200114-pull-request' into staging (2020-01-14 16:00:31 +0000)
9
15
10
are available in the Git repository at:
16
are available in the Git repository at:
11
17
12
https://gitlab.com/rth7680/qemu.git tags/pull-tcg-20241212
18
https://github.com/rth7680/qemu.git tags/pull-tcg-20200115
13
19
14
for you to fetch changes up to 7ac87b14a92234b6a89b701b4043ad6cf8bdcccf:
20
for you to fetch changes up to 3e5a01ef0268ee4c9d342a26dbf6624d6b5b20d6:
15
21
16
target/sparc: Use memcpy() and remove memcpy32() (2024-12-12 14:28:38 -0600)
22
MAINTAINERS: Replace Claudio Fontana for tcg/aarch64 (2020-01-15 15:13:10 -1000)
17
23
18
----------------------------------------------------------------
24
----------------------------------------------------------------
19
tcg: Reset free_temps before tcg_optimize
25
Add cpu_{ld,st}*_mmuidx_ra
20
tcg/riscv: Fix StoreStore barrier generation
26
Remove MMU_MODE*_SUFFIX
21
include/exec: Introduce fpst alias in helper-head.h.inc
27
Move tcg headers under include/
22
target/sparc: Use memcpy() and remove memcpy32()
23
28
24
----------------------------------------------------------------
29
----------------------------------------------------------------
25
Philippe Mathieu-Daudé (1):
30
Philippe Mathieu-Daudé (4):
26
target/sparc: Use memcpy() and remove memcpy32()
31
tcg: Search includes from the project root source directory
32
tcg: Search includes in the parent source directory
33
tcg: Move TCG headers to include/tcg/
34
configure: Remove tcg/ from the preprocessor include search list
27
35
28
Richard Henderson (2):
36
Richard Henderson (30):
29
tcg: Reset free_temps before tcg_optimize
37
target/xtensa: Use probe_access for itlb_hit_test
30
include/exec: Introduce fpst alias in helper-head.h.inc
38
cputlb: Use trace_mem_get_info instead of trace_mem_build_info
39
trace: Remove trace_mem_build_info_no_se_[bl]e
40
target/s390x: Include tcg.h in mem_helper.c
41
target/arm: Include tcg.h in sve_helper.c
42
accel/tcg: Include tcg.h in tcg-runtime.c
43
linux-user: Include tcg.h in syscall.c
44
linux-user: Include trace-root.h in syscall-trace.h
45
plugins: Include trace/mem.h in api.c
46
cputlb: Move body of cpu_ldst_template.h out of line
47
translator: Use cpu_ld*_code instead of open-coding
48
cputlb: Rename helper_ret_ld*_cmmu to cpu_ld*_code
49
cputlb: Provide cpu_(ld,st}*_mmuidx_ra for user-only
50
target/i386: Use cpu_*_mmuidx_ra instead of templates
51
cputlb: Expand cpu_ldst_useronly_template.h in user-exec.c
52
target/nios2: Remove MMU_MODE{0,1}_SUFFIX
53
target/alpha: Remove MMU_MODE{0,1}_SUFFIX
54
target/cris: Remove MMU_MODE{0,1}_SUFFIX
55
target/i386: Remove MMU_MODE{0,1,2}_SUFFIX
56
target/microblaze: Remove MMU_MODE{0,1,2}_SUFFIX
57
target/sh4: Remove MMU_MODE{0,1}_SUFFIX
58
target/unicore32: Remove MMU_MODE{0,1}_SUFFIX
59
target/xtensa: Remove MMU_MODE{0,1,2,3}_SUFFIX
60
target/m68k: Use cpu_*_mmuidx_ra instead of MMU_MODE{0,1}_SUFFIX
61
target/mips: Use cpu_*_mmuidx_ra instead of MMU_MODE*_SUFFIX
62
target/s390x: Use cpu_*_mmuidx_ra instead of MMU_MODE*_SUFFIX
63
target/ppc: Use cpu_*_mmuidx_ra instead of MMU_MODE*_SUFFIX
64
cputlb: Remove support for MMU_MODE*_SUFFIX
65
cputlb: Expand cpu_ldst_template.h in cputlb.c
66
MAINTAINERS: Replace Claudio Fontana for tcg/aarch64
31
67
32
Roman Artemev (1):
68
accel/tcg/atomic_template.h | 67 ++---
33
tcg/riscv: Fix StoreStore barrier generation
69
include/exec/cpu_ldst.h | 446 +++++++++---------------------
70
include/exec/cpu_ldst_template.h | 211 --------------
71
include/exec/cpu_ldst_useronly_template.h | 159 -----------
72
include/exec/translator.h | 48 +---
73
{tcg => include/tcg}/tcg-gvec-desc.h | 0
74
{tcg => include/tcg}/tcg-mo.h | 0
75
{tcg => include/tcg}/tcg-op-gvec.h | 0
76
{tcg => include/tcg}/tcg-op.h | 2 +-
77
{tcg => include/tcg}/tcg-opc.h | 0
78
{tcg => include/tcg}/tcg.h | 33 +--
79
include/user/syscall-trace.h | 2 +
80
target/alpha/cpu.h | 2 -
81
target/cris/cpu.h | 2 -
82
target/i386/cpu.h | 3 -
83
target/m68k/cpu.h | 2 -
84
target/microblaze/cpu.h | 3 -
85
target/mips/cpu.h | 4 -
86
target/nios2/cpu.h | 2 -
87
target/ppc/cpu.h | 2 -
88
target/s390x/cpu.h | 5 -
89
target/sh4/cpu.h | 2 -
90
target/unicore32/cpu.h | 2 -
91
target/xtensa/cpu.h | 4 -
92
tcg/i386/tcg-target.h | 2 +-
93
trace/mem-internal.h | 17 --
94
accel/tcg/cpu-exec.c | 2 +-
95
accel/tcg/cputlb.c | 315 ++++++++++++++++-----
96
accel/tcg/tcg-runtime-gvec.c | 2 +-
97
accel/tcg/tcg-runtime.c | 1 +
98
accel/tcg/translate-all.c | 2 +-
99
accel/tcg/user-exec.c | 238 +++++++++++++++-
100
bsd-user/main.c | 2 +-
101
cpus.c | 2 +-
102
exec.c | 2 +-
103
linux-user/main.c | 2 +-
104
linux-user/syscall.c | 1 +
105
plugins/api.c | 1 +
106
target/alpha/translate.c | 2 +-
107
target/arm/helper-a64.c | 2 +-
108
target/arm/sve_helper.c | 1 +
109
target/arm/translate-a64.c | 4 +-
110
target/arm/translate-sve.c | 6 +-
111
target/arm/translate.c | 4 +-
112
target/cris/translate.c | 2 +-
113
target/hppa/translate.c | 2 +-
114
target/i386/mem_helper.c | 2 +-
115
target/i386/seg_helper.c | 56 ++--
116
target/i386/translate.c | 2 +-
117
target/lm32/translate.c | 2 +-
118
target/m68k/op_helper.c | 77 ++++--
119
target/m68k/translate.c | 2 +-
120
target/microblaze/translate.c | 2 +-
121
target/mips/op_helper.c | 182 ++++--------
122
target/mips/translate.c | 2 +-
123
target/moxie/translate.c | 2 +-
124
target/nios2/translate.c | 2 +-
125
target/openrisc/translate.c | 2 +-
126
target/ppc/mem_helper.c | 13 +-
127
target/ppc/translate.c | 4 +-
128
target/riscv/cpu_helper.c | 2 +-
129
target/riscv/translate.c | 2 +-
130
target/s390x/mem_helper.c | 11 +-
131
target/s390x/translate.c | 4 +-
132
target/sh4/translate.c | 2 +-
133
target/sparc/ldst_helper.c | 2 +-
134
target/sparc/translate.c | 2 +-
135
target/tilegx/translate.c | 2 +-
136
target/tricore/translate.c | 2 +-
137
target/unicore32/translate.c | 2 +-
138
target/xtensa/mmu_helper.c | 5 +-
139
target/xtensa/translate.c | 2 +-
140
tcg/aarch64/tcg-target.inc.c | 4 +-
141
tcg/arm/tcg-target.inc.c | 4 +-
142
tcg/i386/tcg-target.inc.c | 4 +-
143
tcg/mips/tcg-target.inc.c | 2 +-
144
tcg/optimize.c | 2 +-
145
tcg/ppc/tcg-target.inc.c | 4 +-
146
tcg/riscv/tcg-target.inc.c | 4 +-
147
tcg/s390/tcg-target.inc.c | 4 +-
148
tcg/sparc/tcg-target.inc.c | 2 +-
149
tcg/tcg-common.c | 2 +-
150
tcg/tcg-op-gvec.c | 8 +-
151
tcg/tcg-op-vec.c | 6 +-
152
tcg/tcg-op.c | 6 +-
153
tcg/tcg.c | 2 +-
154
tcg/tci.c | 2 +-
155
MAINTAINERS | 4 +-
156
configure | 1 -
157
docs/devel/loads-stores.rst | 215 ++++++++++----
158
90 files changed, 1037 insertions(+), 1240 deletions(-)
159
delete mode 100644 include/exec/cpu_ldst_template.h
160
delete mode 100644 include/exec/cpu_ldst_useronly_template.h
161
rename {tcg => include/tcg}/tcg-gvec-desc.h (100%)
162
rename {tcg => include/tcg}/tcg-mo.h (100%)
163
rename {tcg => include/tcg}/tcg-op-gvec.h (100%)
164
rename {tcg => include/tcg}/tcg-op.h (99%)
165
rename {tcg => include/tcg}/tcg-opc.h (100%)
166
rename {tcg => include/tcg}/tcg.h (96%)
34
167
35
include/tcg/tcg-temp-internal.h | 6 ++++++
36
accel/tcg/plugin-gen.c | 2 +-
37
target/sparc/win_helper.c | 26 ++++++++------------------
38
tcg/tcg.c | 5 ++++-
39
include/exec/helper-head.h.inc | 3 +++
40
tcg/riscv/tcg-target.c.inc | 2 +-
41
6 files changed, 23 insertions(+), 21 deletions(-)
42
diff view generated by jsdifflib
[PULL 1/4] tcg: Reset free_temps before tcg_optimize
Deleted patch
1
When allocating new temps during tcg_optmize, do not re-use
2
any EBB temps that were used within the TB. We do not have
3
any idea what span of the TB in which the temp was live.
4
1
5
Introduce tcg_temp_ebb_reset_freed and use before tcg_optimize,
6
as well as replacing the equivalent in plugin_gen_inject and
7
tcg_func_start.
8
9
Cc: qemu-stable@nongnu.org
10
Fixes: fb04ab7ddd8 ("tcg/optimize: Lower TCG_COND_TST{EQ,NE} if unsupported")
11
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2711
12
Reported-by: wannacu <wannacu2049@gmail.com>
13
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
14
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
15
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
16
---
17
include/tcg/tcg-temp-internal.h | 6 ++++++
18
accel/tcg/plugin-gen.c | 2 +-
19
tcg/tcg.c | 5 ++++-
20
3 files changed, 11 insertions(+), 2 deletions(-)
21
22
diff --git a/include/tcg/tcg-temp-internal.h b/include/tcg/tcg-temp-internal.h
23
index XXXXXXX..XXXXXXX 100644
24
--- a/include/tcg/tcg-temp-internal.h
25
+++ b/include/tcg/tcg-temp-internal.h
26
@@ -XXX,XX +XXX,XX @@ TCGv_i64 tcg_temp_ebb_new_i64(void);
27
TCGv_ptr tcg_temp_ebb_new_ptr(void);
28
TCGv_i128 tcg_temp_ebb_new_i128(void);
29
30
+/* Forget all freed EBB temps, so that new allocations produce new temps. */
31
+static inline void tcg_temp_ebb_reset_freed(TCGContext *s)
32
+{
33
+ memset(s->free_temps, 0, sizeof(s->free_temps));
34
+}
35
+
36
#endif /* TCG_TEMP_FREE_H */
37
diff --git a/accel/tcg/plugin-gen.c b/accel/tcg/plugin-gen.c
38
index XXXXXXX..XXXXXXX 100644
39
--- a/accel/tcg/plugin-gen.c
40
+++ b/accel/tcg/plugin-gen.c
41
@@ -XXX,XX +XXX,XX @@ static void plugin_gen_inject(struct qemu_plugin_tb *plugin_tb)
42
* that might be live within the existing opcode stream.
43
* The simplest solution is to release them all and create new.
44
*/
45
- memset(tcg_ctx->free_temps, 0, sizeof(tcg_ctx->free_temps));
46
+ tcg_temp_ebb_reset_freed(tcg_ctx);
47
48
QTAILQ_FOREACH_SAFE(op, &tcg_ctx->ops, link, next) {
49
switch (op->opc) {
50
diff --git a/tcg/tcg.c b/tcg/tcg.c
51
index XXXXXXX..XXXXXXX 100644
52
--- a/tcg/tcg.c
53
+++ b/tcg/tcg.c
54
@@ -XXX,XX +XXX,XX @@ void tcg_func_start(TCGContext *s)
55
s->nb_temps = s->nb_globals;
56
57
/* No temps have been previously allocated for size or locality. */
58
- memset(s->free_temps, 0, sizeof(s->free_temps));
59
+ tcg_temp_ebb_reset_freed(s);
60
61
/* No constant temps have been previously allocated. */
62
for (int i = 0; i < TCG_TYPE_COUNT; ++i) {
63
@@ -XXX,XX +XXX,XX @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb, uint64_t pc_start)
64
}
65
#endif
66
67
+ /* Do not reuse any EBB that may be allocated within the TB. */
68
+ tcg_temp_ebb_reset_freed(s);
69
+
70
tcg_optimize(s);
71
72
reachable_code_pass(s);
73
--
74
2.43.0
75
76
diff view generated by jsdifflib
[PULL 2/4] tcg/riscv: Fix StoreStore barrier generation
Deleted patch
1
From: Roman Artemev <roman.artemev@syntacore.com>
2
1
3
On RISC-V to StoreStore barrier corresponds
4
`fence w, w` not `fence r, r`
5
6
Cc: qemu-stable@nongnu.org
7
Fixes: efbea94c76b ("tcg/riscv: Add slowpath load and store instructions")
8
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
9
Signed-off-by: Denis Tomashev <denis.tomashev@syntacore.com>
10
Signed-off-by: Roman Artemev <roman.artemev@syntacore.com>
11
Message-ID: <e2f2131e294a49e79959d4fa9ec02cf4@syntacore.com>
12
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
13
---
14
tcg/riscv/tcg-target.c.inc | 2 +-
15
1 file changed, 1 insertion(+), 1 deletion(-)
16
17
diff --git a/tcg/riscv/tcg-target.c.inc b/tcg/riscv/tcg-target.c.inc
18
index XXXXXXX..XXXXXXX 100644
19
--- a/tcg/riscv/tcg-target.c.inc
20
+++ b/tcg/riscv/tcg-target.c.inc
21
@@ -XXX,XX +XXX,XX @@ static void tcg_out_mb(TCGContext *s, TCGArg a0)
22
insn |= 0x02100000;
23
}
24
if (a0 & TCG_MO_ST_ST) {
25
- insn |= 0x02200000;
26
+ insn |= 0x01100000;
27
}
28
tcg_out32(s, insn);
29
}
30
--
31
2.43.0
diff view generated by jsdifflib
[PULL 3/4] include/exec: Introduce fpst alias in helper-head.h.inc
Deleted patch
1
This allows targets to declare that the helper requires a
2
float_status pointer and instead of a generic void pointer.
3
1
4
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
5
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
6
---
7
include/exec/helper-head.h.inc | 3 +++
8
1 file changed, 3 insertions(+)
9
10
diff --git a/include/exec/helper-head.h.inc b/include/exec/helper-head.h.inc
11
index XXXXXXX..XXXXXXX 100644
12
--- a/include/exec/helper-head.h.inc
13
+++ b/include/exec/helper-head.h.inc
14
@@ -XXX,XX +XXX,XX @@
15
#define dh_alias_ptr ptr
16
#define dh_alias_cptr ptr
17
#define dh_alias_env ptr
18
+#define dh_alias_fpst ptr
19
#define dh_alias_void void
20
#define dh_alias_noreturn noreturn
21
#define dh_alias(t) glue(dh_alias_, t)
22
@@ -XXX,XX +XXX,XX @@
23
#define dh_ctype_ptr void *
24
#define dh_ctype_cptr const void *
25
#define dh_ctype_env CPUArchState *
26
+#define dh_ctype_fpst float_status *
27
#define dh_ctype_void void
28
#define dh_ctype_noreturn G_NORETURN void
29
#define dh_ctype(t) dh_ctype_##t
30
@@ -XXX,XX +XXX,XX @@
31
#define dh_typecode_f64 dh_typecode_i64
32
#define dh_typecode_cptr dh_typecode_ptr
33
#define dh_typecode_env dh_typecode_ptr
34
+#define dh_typecode_fpst dh_typecode_ptr
35
#define dh_typecode(t) dh_typecode_##t
36
37
#define dh_callflag_i32 0
38
--
39
2.43.0
40
41
diff view generated by jsdifflib
[PULL 4/4] target/sparc: Use memcpy() and remove memcpy32()
Deleted patch
1
From: Philippe Mathieu-Daudé <philmd@linaro.org>
2
1
3
Rather than manually copying each register, use
4
the libc memcpy(), which is well optimized nowadays.
5
6
Suggested-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
7
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
8
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
9
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
10
Message-ID: <20241205205418.67613-1-philmd@linaro.org>
11
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
12
---
13
target/sparc/win_helper.c | 26 ++++++++------------------
14
1 file changed, 8 insertions(+), 18 deletions(-)
15
16
diff --git a/target/sparc/win_helper.c b/target/sparc/win_helper.c
17
index XXXXXXX..XXXXXXX 100644
18
--- a/target/sparc/win_helper.c
19
+++ b/target/sparc/win_helper.c
20
@@ -XXX,XX +XXX,XX @@
21
#include "exec/helper-proto.h"
22
#include "trace.h"
23
24
-static inline void memcpy32(target_ulong *dst, const target_ulong *src)
25
-{
26
- dst[0] = src[0];
27
- dst[1] = src[1];
28
- dst[2] = src[2];
29
- dst[3] = src[3];
30
- dst[4] = src[4];
31
- dst[5] = src[5];
32
- dst[6] = src[6];
33
- dst[7] = src[7];
34
-}
35
-
36
void cpu_set_cwp(CPUSPARCState *env, int new_cwp)
37
{
38
/* put the modified wrap registers at their proper location */
39
if (env->cwp == env->nwindows - 1) {
40
- memcpy32(env->regbase, env->regbase + env->nwindows * 16);
41
+ memcpy(env->regbase, env->regbase + env->nwindows * 16,
42
+ sizeof(env->gregs));
43
}
44
env->cwp = new_cwp;
45
46
/* put the wrap registers at their temporary location */
47
if (new_cwp == env->nwindows - 1) {
48
- memcpy32(env->regbase + env->nwindows * 16, env->regbase);
49
+ memcpy(env->regbase + env->nwindows * 16, env->regbase,
50
+ sizeof(env->gregs));
51
}
52
env->regwptr = env->regbase + (new_cwp * 16);
53
}
54
@@ -XXX,XX +XXX,XX @@ void cpu_gl_switch_gregs(CPUSPARCState *env, uint32_t new_gl)
55
dst = get_gl_gregset(env, env->gl);
56
57
if (src != dst) {
58
- memcpy32(dst, env->gregs);
59
- memcpy32(env->gregs, src);
60
+ memcpy(dst, env->gregs, sizeof(env->gregs));
61
+ memcpy(env->gregs, src, sizeof(env->gregs));
62
}
63
}
64
65
@@ -XXX,XX +XXX,XX @@ void cpu_change_pstate(CPUSPARCState *env, uint32_t new_pstate)
66
/* Switch global register bank */
67
src = get_gregset(env, new_pstate_regs);
68
dst = get_gregset(env, pstate_regs);
69
- memcpy32(dst, env->gregs);
70
- memcpy32(env->gregs, src);
71
+ memcpy(dst, env->gregs, sizeof(env->gregs));
72
+ memcpy(env->gregs, src, sizeof(env->gregs));
73
} else {
74
trace_win_helper_no_switch_pstate(new_pstate_regs);
75
}
76
--
77
2.43.0
78
79
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.