From: Anton Johansson via <qemu-devel@nongnu.org>
To: qemu-devel@nongnu.org
Cc: ale@rev.ng, richard.henderson@linaro.org, pbonzini@redhat.com,
eduardo@habkost.net, peter.maydell@linaro.org, mrolnik@gmail.com,
tsimpson@quicinc.com, gaosong@loongson.cn,
yangxiaojuan@loongson.cn, edgar.iglesias@gmail.com,
philmd@linaro.org, shorne@gmail.com, palmer@dabbelt.com,
alistair.francis@wdc.com, bin.meng@windriver.com,
ysato@users.sourceforge.jp, mark.cave-ayland@ilande.co.uk,
atar4qemu@gmail.com, kbastian@mail.uni-paderborn.de
Subject: [PATCH v2 11/27] accel/tcg: Move jmp-cache `CF_PCREL` checks to caller
Date: Tue, 21 Feb 2023 23:18:02 +0100 [thread overview]
Message-ID: <20230221221818.9382-12-anjo@rev.ng> (raw)
In-Reply-To: <20230221221818.9382-1-anjo@rev.ng>
tb-jmp-cache.h contains a few small functions that only exist to hide a
CF_PCREL check, however the caller often already performs such a check.
This patch moves CF_PCREL checks from the callee to the caller, and also
removes these functions which now only hide an access of the jmp-cache.
Signed-off-by: Anton Johansson <anjo@rev.ng>
---
accel/tcg/cpu-exec.c | 56 +++++++++++++++++++++++++++++-----------
accel/tcg/tb-jmp-cache.h | 36 --------------------------
2 files changed, 41 insertions(+), 51 deletions(-)
diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c
index 92b833adcf..5efa8bf42a 100644
--- a/accel/tcg/cpu-exec.c
+++ b/accel/tcg/cpu-exec.c
@@ -256,21 +256,46 @@ static inline TranslationBlock *tb_lookup(CPUState *cpu, target_ulong pc,
hash = tb_jmp_cache_hash_func(pc);
jc = cpu->tb_jmp_cache;
- tb = tb_jmp_cache_get_tb(jc, cflags, hash);
-
- if (likely(tb &&
- tb_jmp_cache_get_pc(jc, hash, tb) == pc &&
- tb->cs_base == cs_base &&
- tb->flags == flags &&
- tb->trace_vcpu_dstate == *cpu->trace_dstate &&
- tb_cflags(tb) == cflags)) {
- return tb;
- }
- tb = tb_htable_lookup(cpu, pc, cs_base, flags, cflags);
- if (tb == NULL) {
- return NULL;
+
+ if (cflags & CF_PCREL) {
+ /* Use acquire to ensure current load of pc from jc. */
+ tb = qatomic_load_acquire(&jc->array[hash].tb);
+
+ if (likely(tb &&
+ jc->array[hash].pc == pc &&
+ tb->cs_base == cs_base &&
+ tb->flags == flags &&
+ tb->trace_vcpu_dstate == *cpu->trace_dstate &&
+ tb_cflags(tb) == cflags)) {
+ return tb;
+ }
+ tb = tb_htable_lookup(cpu, pc, cs_base, flags, cflags);
+ if (tb == NULL) {
+ return NULL;
+ }
+ jc->array[hash].pc = pc;
+ /* Use store_release on tb to ensure pc is written first. */
+ qatomic_store_release(&jc->array[hash].tb, tb);
+ } else {
+ /* Use rcu_read to ensure current load of pc from *tb. */
+ tb = qatomic_rcu_read(&jc->array[hash].tb);
+
+ if (likely(tb &&
+ tb_pc(tb) == pc &&
+ tb->cs_base == cs_base &&
+ tb->flags == flags &&
+ tb->trace_vcpu_dstate == *cpu->trace_dstate &&
+ tb_cflags(tb) == cflags)) {
+ return tb;
+ }
+ tb = tb_htable_lookup(cpu, pc, cs_base, flags, cflags);
+ if (tb == NULL) {
+ return NULL;
+ }
+ /* Use the pc value already stored in tb->pc. */
+ qatomic_set(&jc->array[hash].tb, tb);
}
- tb_jmp_cache_set(jc, hash, tb, pc);
+
return tb;
}
@@ -959,7 +984,8 @@ cpu_exec_loop(CPUState *cpu, SyncClocks *sc)
* for the fast lookup
*/
h = tb_jmp_cache_hash_func(pc);
- tb_jmp_cache_set(cpu->tb_jmp_cache, h, tb, pc);
+ /* Use the pc value already stored in tb->pc. */
+ qatomic_set(&cpu->tb_jmp_cache->array[h].tb, tb);
}
#ifndef CONFIG_USER_ONLY
diff --git a/accel/tcg/tb-jmp-cache.h b/accel/tcg/tb-jmp-cache.h
index 083939b302..bee87eb840 100644
--- a/accel/tcg/tb-jmp-cache.h
+++ b/accel/tcg/tb-jmp-cache.h
@@ -25,40 +25,4 @@ struct CPUJumpCache {
} array[TB_JMP_CACHE_SIZE];
};
-static inline TranslationBlock *
-tb_jmp_cache_get_tb(CPUJumpCache *jc, uint32_t cflags, uint32_t hash)
-{
- if (cflags & CF_PCREL) {
- /* Use acquire to ensure current load of pc from jc. */
- return qatomic_load_acquire(&jc->array[hash].tb);
- } else {
- /* Use rcu_read to ensure current load of pc from *tb. */
- return qatomic_rcu_read(&jc->array[hash].tb);
- }
-}
-
-static inline target_ulong
-tb_jmp_cache_get_pc(CPUJumpCache *jc, uint32_t hash, TranslationBlock *tb)
-{
- if (tb_cflags(tb) & CF_PCREL) {
- return jc->array[hash].pc;
- } else {
- return tb_pc(tb);
- }
-}
-
-static inline void
-tb_jmp_cache_set(CPUJumpCache *jc, uint32_t hash,
- TranslationBlock *tb, target_ulong pc)
-{
- if (tb_cflags(tb) & CF_PCREL) {
- jc->array[hash].pc = pc;
- /* Use store_release on tb to ensure pc is written first. */
- qatomic_store_release(&jc->array[hash].tb, tb);
- } else{
- /* Use the pc value already stored in tb->pc. */
- qatomic_set(&jc->array[hash].tb, tb);
- }
-}
-
#endif /* ACCEL_TCG_TB_JMP_CACHE_H */
--
2.39.1
next prev parent reply other threads:[~2023-02-21 22:24 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-21 22:17 [PATCH v2 00/27] Replace TARGET_TB_PCREL with CF_PCREL Anton Johansson via
2023-02-21 22:17 ` [PATCH v2 01/27] include/exec: Introduce `CF_PCREL` Anton Johansson via
2023-02-21 22:17 ` [PATCH v2 02/27] target/i386: set `CF_PCREL` in `x86_cpu_realizefn` Anton Johansson via
2023-02-21 22:17 ` [PATCH v2 03/27] target/arm: set `CF_PCREL` in `arm_cpu_realizefn` Anton Johansson via
2023-02-21 22:17 ` [PATCH v2 04/27] accel/tcg: Replace `TARGET_TB_PCREL` with `CF_PCREL` Anton Johansson via
2023-02-21 22:17 ` [PATCH v2 05/27] include/exec: " Anton Johansson via
2023-02-21 22:17 ` [PATCH v2 06/27] target/arm: " Anton Johansson via
2023-02-21 22:17 ` [PATCH v2 07/27] target/i386: " Anton Johansson via
2023-02-21 22:17 ` [PATCH v2 08/27] include/exec: Remove `TARGET_TB_PCREL` define Anton Johansson via
2023-02-21 22:18 ` [PATCH v2 09/27] target/arm: " Anton Johansson via
2023-02-21 22:18 ` [PATCH v2 10/27] target/i386: " Anton Johansson via
2023-02-21 22:18 ` Anton Johansson via [this message]
2023-02-21 22:18 ` [PATCH v2 12/27] accel/tcg: Replace `tb_pc()` with `tb->pc` Anton Johansson via
2023-02-21 22:18 ` [PATCH v2 13/27] target/tricore: " Anton Johansson via
2023-02-21 22:18 ` [PATCH v2 14/27] target/sparc: " Anton Johansson via
2023-02-21 22:18 ` [PATCH v2 15/27] target/sh4: " Anton Johansson via
2023-02-21 22:18 ` [PATCH v2 16/27] target/rx: " Anton Johansson via
2023-02-21 22:18 ` [PATCH v2 17/27] target/riscv: " Anton Johansson via
2023-02-21 22:18 ` [PATCH v2 18/27] target/openrisc: " Anton Johansson via
2023-02-21 22:18 ` [PATCH v2 19/27] target/mips: " Anton Johansson via
2023-02-21 22:18 ` [PATCH v2 20/27] target/microblaze: " Anton Johansson via
2023-02-21 22:18 ` [PATCH v2 21/27] target/loongarch: " Anton Johansson via
2023-02-21 22:18 ` [PATCH v2 22/27] target/i386: " Anton Johansson via
2023-02-21 22:18 ` [PATCH v2 23/27] target/hppa: " Anton Johansson via
2023-02-21 22:18 ` [PATCH v2 24/27] target/hexagon: " Anton Johansson via
2023-02-21 22:18 ` [PATCH v2 25/27] target/avr: " Anton Johansson via
2023-02-21 22:18 ` [PATCH v2 26/27] target/arm: " Anton Johansson via
2023-02-21 22:18 ` [PATCH v2 27/27] include/exec: Remove `tb_pc()` Anton Johansson via
2023-02-21 22:39 ` [PATCH v2 00/27] Replace TARGET_TB_PCREL with CF_PCREL Philippe Mathieu-Daudé
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=20230221221818.9382-12-anjo@rev.ng \
--to=qemu-devel@nongnu.org \
--cc=ale@rev.ng \
--cc=alistair.francis@wdc.com \
--cc=anjo@rev.ng \
--cc=atar4qemu@gmail.com \
--cc=bin.meng@windriver.com \
--cc=edgar.iglesias@gmail.com \
--cc=eduardo@habkost.net \
--cc=gaosong@loongson.cn \
--cc=kbastian@mail.uni-paderborn.de \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=mrolnik@gmail.com \
--cc=palmer@dabbelt.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=richard.henderson@linaro.org \
--cc=shorne@gmail.com \
--cc=tsimpson@quicinc.com \
--cc=yangxiaojuan@loongson.cn \
--cc=ysato@users.sourceforge.jp \
/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).