1
Pretty small still, but there are two patches that ought
1
v2: Fix mis-attributed --author.
2
to get backported to stable, so no point in delaying.
2
3
3
4
r~
4
r~
5
5
6
The following changes since commit a5ba0a7e4e150d1350a041f0d0ef9ca6c8d7c307:
7
6
8
Merge tag 'pull-aspeed-20241211' of https://github.com/legoater/qemu into staging (2024-12-11 15:16:47 +0000)
7
The following changes since commit 627634031092e1514f363fd8659a579398de0f0e:
8
9
Merge tag 'buildsys-qom-qdev-ui-20230227' of https://github.com/philmd/qemu into staging (2023-02-28 15:09:18 +0000)
9
10
10
are available in the Git repository at:
11
are available in the Git repository at:
11
12
12
https://gitlab.com/rth7680/qemu.git tags/pull-tcg-20241212
13
https://gitlab.com/rth7680/qemu.git tags/pull-tcg-20230301
13
14
14
for you to fetch changes up to 7ac87b14a92234b6a89b701b4043ad6cf8bdcccf:
15
for you to fetch changes up to 9644e7142a2a2bb4b4743a3a4c940edbab16ca11:
15
16
16
target/sparc: Use memcpy() and remove memcpy32() (2024-12-12 14:28:38 -0600)
17
tcg: Update docs/devel/tcg-ops.rst for temporary changes (2023-03-01 07:33:28 -1000)
17
18
18
----------------------------------------------------------------
19
----------------------------------------------------------------
19
tcg: Reset free_temps before tcg_optimize
20
helper-head: Add fpu/softfloat-types.h
20
tcg/riscv: Fix StoreStore barrier generation
21
softmmu: Use memmove in flatview_write_continue
21
include/exec: Introduce fpst alias in helper-head.h.inc
22
tcg: Add sign param to probe_access_flags, probe_access_full
22
target/sparc: Use memcpy() and remove memcpy32()
23
tcg: Convert TARGET_TB_PCREL to CF_PCREL
24
tcg: Simplify temporary lifetimes for translators
23
25
24
----------------------------------------------------------------
26
----------------------------------------------------------------
27
Akihiko Odaki (1):
28
softmmu: Use memmove in flatview_write_continue
29
30
Anton Johansson (27):
31
include/exec: Introduce `CF_PCREL`
32
target/i386: set `CF_PCREL` in `x86_cpu_realizefn`
33
target/arm: set `CF_PCREL` in `arm_cpu_realizefn`
34
accel/tcg: Replace `TARGET_TB_PCREL` with `CF_PCREL`
35
include/exec: Replace `TARGET_TB_PCREL` with `CF_PCREL`
36
target/arm: Replace `TARGET_TB_PCREL` with `CF_PCREL`
37
target/i386: Replace `TARGET_TB_PCREL` with `CF_PCREL`
38
include/exec: Remove `TARGET_TB_PCREL` define
39
target/arm: Remove `TARGET_TB_PCREL` define
40
target/i386: Remove `TARGET_TB_PCREL` define
41
accel/tcg: Move jmp-cache `CF_PCREL` checks to caller
42
accel/tcg: Replace `tb_pc()` with `tb->pc`
43
target/tricore: Replace `tb_pc()` with `tb->pc`
44
target/sparc: Replace `tb_pc()` with `tb->pc`
45
target/sh4: Replace `tb_pc()` with `tb->pc`
46
target/rx: Replace `tb_pc()` with `tb->pc`
47
target/riscv: Replace `tb_pc()` with `tb->pc`
48
target/openrisc: Replace `tb_pc()` with `tb->pc`
49
target/mips: Replace `tb_pc()` with `tb->pc`
50
target/microblaze: Replace `tb_pc()` with `tb->pc`
51
target/loongarch: Replace `tb_pc()` with `tb->pc`
52
target/i386: Replace `tb_pc()` with `tb->pc`
53
target/hppa: Replace `tb_pc()` with `tb->pc`
54
target/hexagon: Replace `tb_pc()` with `tb->pc`
55
target/avr: Replace `tb_pc()` with `tb->pc`
56
target/arm: Replace `tb_pc()` with `tb->pc`
57
include/exec: Remove `tb_pc()`
58
59
Daniel Henrique Barboza (1):
60
accel/tcg: Add 'size' param to probe_access_flags()
61
25
Philippe Mathieu-Daudé (1):
62
Philippe Mathieu-Daudé (1):
26
target/sparc: Use memcpy() and remove memcpy32()
63
exec/helper-head: Include missing "fpu/softfloat-types.h" header
27
64
28
Richard Henderson (2):
65
Richard Henderson (32):
29
tcg: Reset free_temps before tcg_optimize
66
accel/tcg: Add 'size' param to probe_access_full
30
include/exec: Introduce fpst alias in helper-head.h.inc
67
tcg: Adjust TCGContext.temps_in_use check
68
accel/tcg: Pass max_insn to gen_intermediate_code by pointer
69
accel/tcg: Use more accurate max_insns for tb_overflow
70
tcg: Remove branch-to-next regardless of reference count
71
tcg: Rename TEMP_LOCAL to TEMP_TB
72
tcg: Use noinline for major tcg_gen_code subroutines
73
tcg: Add liveness_pass_0
74
tcg: Remove TEMP_NORMAL
75
tcg: Pass TCGTempKind to tcg_temp_new_internal
76
tcg: Use tcg_constant_i32 in tcg_gen_io_start
77
tcg: Add tcg_gen_movi_ptr
78
tcg: Add tcg_temp_ebb_new_{i32,i64,ptr}
79
tcg: Use tcg_temp_ebb_new_* in tcg/
80
tcg: Use tcg_constant_ptr in do_dup
81
accel/tcg/plugin: Use tcg_temp_ebb_*
82
accel/tcg/plugin: Tidy plugin_gen_disable_mem_helpers
83
tcg: Don't re-use TEMP_TB temporaries
84
tcg: Change default temp lifetime to TEMP_TB
85
target/arm: Drop copies in gen_sve_{ldr,str}
86
target/arm: Don't use tcg_temp_local_new_*
87
target/cris: Don't use tcg_temp_local_new
88
target/hexagon: Don't use tcg_temp_local_new_*
89
target/hexagon/idef-parser: Drop gen_tmp_local
90
target/hppa: Don't use tcg_temp_local_new
91
target/i386: Don't use tcg_temp_local_new
92
target/mips: Don't use tcg_temp_local_new
93
target/ppc: Don't use tcg_temp_local_new
94
target/xtensa: Don't use tcg_temp_local_new_*
95
exec/gen-icount: Don't use tcg_temp_local_new_i32
96
tcg: Remove tcg_temp_local_new_*, tcg_const_local_*
97
tcg: Update docs/devel/tcg-ops.rst for temporary changes
31
98
32
Roman Artemev (1):
99
docs/devel/tcg-ops.rst | 230 +++++++++++++----------
33
tcg/riscv: Fix StoreStore barrier generation
100
target/hexagon/idef-parser/README.rst | 4 +-
101
accel/tcg/internal.h | 10 +-
102
accel/tcg/tb-jmp-cache.h | 42 +----
103
include/exec/cpu-defs.h | 3 -
104
include/exec/exec-all.h | 26 +--
105
include/exec/gen-icount.h | 12 +-
106
include/exec/helper-head.h | 2 +
107
include/exec/translator.h | 4 +-
108
include/tcg/tcg-op.h | 7 +-
109
include/tcg/tcg.h | 64 ++++---
110
target/arm/cpu-param.h | 2 -
111
target/arm/tcg/translate-a64.h | 1 -
112
target/arm/tcg/translate.h | 2 +-
113
target/hexagon/gen_tcg.h | 4 +-
114
target/i386/cpu-param.h | 4 -
115
accel/stubs/tcg-stub.c | 2 +-
116
accel/tcg/cpu-exec.c | 62 ++++--
117
accel/tcg/cputlb.c | 21 ++-
118
accel/tcg/perf.c | 2 +-
119
accel/tcg/plugin-gen.c | 32 ++--
120
accel/tcg/tb-maint.c | 10 +-
121
accel/tcg/translate-all.c | 18 +-
122
accel/tcg/translator.c | 6 +-
123
accel/tcg/user-exec.c | 5 +-
124
semihosting/uaccess.c | 2 +-
125
softmmu/physmem.c | 2 +-
126
target/alpha/translate.c | 2 +-
127
target/arm/cpu.c | 17 +-
128
target/arm/ptw.c | 4 +-
129
target/arm/tcg/mte_helper.c | 4 +-
130
target/arm/tcg/sve_helper.c | 4 +-
131
target/arm/tcg/translate-a64.c | 16 +-
132
target/arm/tcg/translate-sve.c | 38 +---
133
target/arm/tcg/translate.c | 14 +-
134
target/avr/cpu.c | 3 +-
135
target/avr/translate.c | 2 +-
136
target/cris/translate.c | 8 +-
137
target/hexagon/cpu.c | 4 +-
138
target/hexagon/genptr.c | 16 +-
139
target/hexagon/idef-parser/parser-helpers.c | 26 +--
140
target/hexagon/translate.c | 4 +-
141
target/hppa/cpu.c | 8 +-
142
target/hppa/translate.c | 5 +-
143
target/i386/cpu.c | 5 +
144
target/i386/helper.c | 2 +-
145
target/i386/tcg/sysemu/excp_helper.c | 4 +-
146
target/i386/tcg/tcg-cpu.c | 8 +-
147
target/i386/tcg/translate.c | 55 +++---
148
target/loongarch/cpu.c | 6 +-
149
target/loongarch/translate.c | 2 +-
150
target/m68k/translate.c | 2 +-
151
target/microblaze/cpu.c | 4 +-
152
target/microblaze/translate.c | 2 +-
153
target/mips/tcg/exception.c | 3 +-
154
target/mips/tcg/sysemu/special_helper.c | 2 +-
155
target/mips/tcg/translate.c | 59 ++----
156
target/nios2/translate.c | 2 +-
157
target/openrisc/cpu.c | 4 +-
158
target/openrisc/translate.c | 2 +-
159
target/ppc/translate.c | 8 +-
160
target/riscv/cpu.c | 7 +-
161
target/riscv/translate.c | 2 +-
162
target/rx/cpu.c | 3 +-
163
target/rx/translate.c | 2 +-
164
target/s390x/tcg/mem_helper.c | 2 +-
165
target/s390x/tcg/translate.c | 2 +-
166
target/sh4/cpu.c | 6 +-
167
target/sh4/translate.c | 2 +-
168
target/sparc/cpu.c | 4 +-
169
target/sparc/translate.c | 2 +-
170
target/tricore/cpu.c | 3 +-
171
target/tricore/translate.c | 2 +-
172
target/xtensa/translate.c | 18 +-
173
tcg/optimize.c | 2 +-
174
tcg/tcg-op-gvec.c | 189 ++++++++++---------
175
tcg/tcg-op.c | 258 ++++++++++++-------------
176
tcg/tcg.c | 280 ++++++++++++++++------------
177
target/cris/translate_v10.c.inc | 10 +-
178
target/mips/tcg/nanomips_translate.c.inc | 4 +-
179
target/ppc/translate/spe-impl.c.inc | 8 +-
180
target/ppc/translate/vmx-impl.c.inc | 4 +-
181
target/hexagon/README | 8 +-
182
target/hexagon/gen_tcg_funcs.py | 18 +-
183
84 files changed, 870 insertions(+), 890 deletions(-)
34
184
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
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
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
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
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