[PATCH 0/2] tcg patch queue
[PULL 0/4] tcg patch queue
1
The following changes since commit bc2e8b18fba33f30f25b7c2d74328493c0a2231d:
1
Pretty small still, but there are two patches that ought
2
to get backported to stable, so no point in delaying.
2
3
3
Merge tag 'hppa64-pull-request' of https://github.com/hdeller/qemu-hppa into staging (2024-02-13 13:56:46 +0000)
4
r~
5
6
The following changes since commit a5ba0a7e4e150d1350a041f0d0ef9ca6c8d7c307:
7
8
Merge tag 'pull-aspeed-20241211' of https://github.com/legoater/qemu into staging (2024-12-11 15:16:47 +0000)
4
9
5
are available in the Git repository at:
10
are available in the Git repository at:
6
11
7
https://gitlab.com/rth7680/qemu.git tags/pull-tcg-20240213
12
https://gitlab.com/rth7680/qemu.git tags/pull-tcg-20241212
8
13
9
for you to fetch changes up to e41f1825b43796c3508ef309ed0b150ef89acc44:
14
for you to fetch changes up to 7ac87b14a92234b6a89b701b4043ad6cf8bdcccf:
10
15
11
tcg/arm: Fix goto_tb for large translation blocks (2024-02-13 07:42:45 -1000)
16
target/sparc: Use memcpy() and remove memcpy32() (2024-12-12 14:28:38 -0600)
12
17
13
----------------------------------------------------------------
18
----------------------------------------------------------------
14
tcg: Increase width of temp_subindex
19
tcg: Reset free_temps before tcg_optimize
15
tcg/arm: Fix goto_tb for large translation blocks
20
tcg/riscv: Fix StoreStore barrier generation
21
include/exec: Introduce fpst alias in helper-head.h.inc
22
target/sparc: Use memcpy() and remove memcpy32()
16
23
17
----------------------------------------------------------------
24
----------------------------------------------------------------
25
Philippe Mathieu-Daudé (1):
26
target/sparc: Use memcpy() and remove memcpy32()
27
18
Richard Henderson (2):
28
Richard Henderson (2):
19
tcg: Increase width of temp_subindex
29
tcg: Reset free_temps before tcg_optimize
20
tcg/arm: Fix goto_tb for large translation blocks
30
include/exec: Introduce fpst alias in helper-head.h.inc
21
31
22
include/tcg/tcg.h | 2 +-
32
Roman Artemev (1):
23
tcg/arm/tcg-target.c.inc | 4 ++--
33
tcg/riscv: Fix StoreStore barrier generation
24
2 files changed, 3 insertions(+), 3 deletions(-)
34
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
[PATCH 1/2] tcg: Increase width of temp_subindex
[PULL 1/4] tcg: Reset free_temps before tcg_optimize
1
We need values 0-3 for TCG_TYPE_I128 on 32-bit hosts.
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
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.
2
8
3
Cc: qemu-stable@nongnu.org
9
Cc: qemu-stable@nongnu.org
4
Fixes: 43eef72f4109 ("tcg: Add temp allocation for TCGv_i128")
10
Fixes: fb04ab7ddd8 ("tcg/optimize: Lower TCG_COND_TST{EQ,NE} if unsupported")
5
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2159
11
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2711
12
Reported-by: wannacu <wannacu2049@gmail.com>
6
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
13
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
14
Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
7
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
15
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
8
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
9
Tested-by: Michael Tokarev <mjt@tls.msk.ru>
10
---
16
---
11
include/tcg/tcg.h | 2 +-
17
include/tcg/tcg-temp-internal.h | 6 ++++++
12
1 file changed, 1 insertion(+), 1 deletion(-)
18
accel/tcg/plugin-gen.c | 2 +-
19
tcg/tcg.c | 5 ++++-
20
3 files changed, 11 insertions(+), 2 deletions(-)
13
21
14
diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h
22
diff --git a/include/tcg/tcg-temp-internal.h b/include/tcg/tcg-temp-internal.h
15
index XXXXXXX..XXXXXXX 100644
23
index XXXXXXX..XXXXXXX 100644
16
--- a/include/tcg/tcg.h
24
--- a/include/tcg/tcg-temp-internal.h
17
+++ b/include/tcg/tcg.h
25
+++ b/include/tcg/tcg-temp-internal.h
18
@@ -XXX,XX +XXX,XX @@ typedef struct TCGTemp {
26
@@ -XXX,XX +XXX,XX @@ TCGv_i64 tcg_temp_ebb_new_i64(void);
19
unsigned int mem_coherent:1;
27
TCGv_ptr tcg_temp_ebb_new_ptr(void);
20
unsigned int mem_allocated:1;
28
TCGv_i128 tcg_temp_ebb_new_i128(void);
21
unsigned int temp_allocated:1;
29
22
- unsigned int temp_subindex:1;
30
+/* Forget all freed EBB temps, so that new allocations produce new temps. */
23
+ unsigned int temp_subindex:2;
31
+static inline void tcg_temp_ebb_reset_freed(TCGContext *s)
24
32
+{
25
int64_t val;
33
+ memset(s->free_temps, 0, sizeof(s->free_temps));
26
struct TCGTemp *mem_base;
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);
27
--
73
--
28
2.34.1
74
2.43.0
29
75
30
76
diff view generated by jsdifflib
New patch
[PULL 2/4] tcg/riscv: Fix StoreStore barrier generation
1
From: Roman Artemev <roman.artemev@syntacore.com>
1
2
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
New patch
[PULL 3/4] include/exec: Introduce fpst alias in helper-head.h.inc
1
This allows targets to declare that the helper requires a
2
float_status pointer and instead of a generic void pointer.
1
3
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
[PATCH 2/2] tcg/arm: Fix goto_tb for large translation blocks
[PULL 4/4] target/sparc: Use memcpy() and remove memcpy32()
1
Correct arithmetic for separating high and low
1
From: Philippe Mathieu-Daudé <philmd@linaro.org>
2
on a large negative number.
3
2
4
Cc: qemu-stable@nongnu.org
3
Rather than manually copying each register, use
5
Fixes: 79ffece4447 ("tcg/arm: Implement direct branch for goto_tb")
4
the libc memcpy(), which is well optimized nowadays.
6
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1714
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>
7
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
11
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
8
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
9
---
12
---
10
tcg/arm/tcg-target.c.inc | 4 ++--
13
target/sparc/win_helper.c | 26 ++++++++------------------
11
1 file changed, 2 insertions(+), 2 deletions(-)
14
1 file changed, 8 insertions(+), 18 deletions(-)
12
15
13
diff --git a/tcg/arm/tcg-target.c.inc b/tcg/arm/tcg-target.c.inc
16
diff --git a/target/sparc/win_helper.c b/target/sparc/win_helper.c
14
index XXXXXXX..XXXXXXX 100644
17
index XXXXXXX..XXXXXXX 100644
15
--- a/tcg/arm/tcg-target.c.inc
18
--- a/target/sparc/win_helper.c
16
+++ b/tcg/arm/tcg-target.c.inc
19
+++ b/target/sparc/win_helper.c
17
@@ -XXX,XX +XXX,XX @@ static void tcg_out_goto_tb(TCGContext *s, int which)
20
@@ -XXX,XX +XXX,XX @@
18
* shifted immediate from pc.
21
#include "exec/helper-proto.h"
19
*/
22
#include "trace.h"
20
int h = -i_disp;
23
21
- int l = h & 0xfff;
24
-static inline void memcpy32(target_ulong *dst, const target_ulong *src)
22
+ int l = -(h & 0xfff);
25
-{
23
26
- dst[0] = src[0];
24
- h = encode_imm_nofail(h - l);
27
- dst[1] = src[1];
25
+ h = encode_imm_nofail(h + l);
28
- dst[2] = src[2];
26
tcg_out_dat_imm(s, COND_AL, ARITH_SUB, TCG_REG_R0, TCG_REG_PC, h);
29
- dst[3] = src[3];
27
tcg_out_ld32_12(s, COND_AL, TCG_REG_PC, TCG_REG_R0, l);
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);
28
}
75
}
29
--
76
--
30
2.34.1
77
2.43.0
78
79
diff view generated by jsdifflib

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.