yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-01-22 08:11:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcg: define CF_PARALLEL and use it for TB hashing along with CF_COUNT_MASK

Browse source 
This will enable us to decouple code translation from the value
of parallel_cpus at any given time. It will also help us minimize
TB flushes when generating code via EXCP_ATOMIC.

Note that the declaration of parallel_cpus is brought to exec-all.h
to be able to define there the "curr_cflags" inline.

Backports commit 4e2ca83e71b51577b06b1468e836556912bd5b6e from qemu
This commit is contained in:
Richard Henderson 2019-05-04 22:17:43 -04:00 committed by Lioncash
parent cc37db76b6
commit ee1ddf4a92
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
6 changed files with 46 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
qemu/accel/tcg/cpu-exec.c
View file

@ -115,7 +115,8 @@ static void cpu_exec_nocache(CPUState *cpu, int max_cycles,
#endif #endif
TranslationBlock *tb_htable_lookup(CPUState *cpu, target_ulong pc, TranslationBlock *tb_htable_lookup(CPUState *cpu, target_ulong pc,
target_ulong cs_base, uint32_t flags) target_ulong cs_base, uint32_t flags,
uint32_t cf_mask)
{ {
TCGContext *tcg_ctx = cpu->uc->tcg_ctx; TCGContext *tcg_ctx = cpu->uc->tcg_ctx;
CPUArchState *env = (CPUArchState *)cpu->env_ptr; CPUArchState *env = (CPUArchState *)cpu->env_ptr;
@ -126,7 +127,7 @@ TranslationBlock *tb_htable_lookup(CPUState *cpu, target_ulong pc,
/* find translated block using physical mappings */ /* find translated block using physical mappings */
phys_pc = get_page_addr_code(env, pc); phys_pc = get_page_addr_code(env, pc);
phys_page1 = phys_pc & TARGET_PAGE_MASK; phys_page1 = phys_pc & TARGET_PAGE_MASK;
h = tb_hash_func(phys_pc, pc, flags); h = tb_hash_func(phys_pc, pc, flags, cf_mask);
/* Start at head of the hash entry */ /* Start at head of the hash entry */
ptb1 = tb_hash_head = &tcg_ctx->tb_ctx.tb_phys_hash[h]; ptb1 = tb_hash_head = &tcg_ctx->tb_ctx.tb_phys_hash[h];
@ -137,8 +138,7 @@ TranslationBlock *tb_htable_lookup(CPUState *cpu, target_ulong pc,
tb->page_addr[0] == phys_page1 && tb->page_addr[0] == phys_page1 &&
tb->cs_base == cs_base && tb->cs_base == cs_base &&
tb->flags == flags && tb->flags == flags &&
!(tb_cflags(tb) & CF_INVALID)) { (tb_cflags(tb) & (CF_HASH_MASK | CF_INVALID)) == cf_mask) {
if (tb->page_addr[1] == -1) { if (tb->page_addr[1] == -1) {
/* done, we have a match */ /* done, we have a match */
break; break;
@ -209,8 +209,9 @@ static inline TranslationBlock *tb_find(CPUState *cpu,
target_ulong cs_base, pc; target_ulong cs_base, pc;
uint32_t flags; uint32_t flags;
bool acquired_tb_lock = false; bool acquired_tb_lock = false;
uint32_t cf_mask = curr_cflags(cpu->uc);
tb = tb_lookup__cpu_state(cpu, &pc, &cs_base, &flags); tb = tb_lookup__cpu_state(cpu, &pc, &cs_base, &flags, cf_mask);
if (tb == NULL) { if (tb == NULL) {
mmap_lock(); mmap_lock();
//tb_lock(); //tb_lock();
@ -219,10 +220,10 @@ static inline TranslationBlock *tb_find(CPUState *cpu,
/* There's a chance that our desired tb has been translated while /* There's a chance that our desired tb has been translated while
* taking the locks so we check again inside the lock. * taking the locks so we check again inside the lock.
*/ */
tb = tb_htable_lookup(cpu, pc, cs_base, flags); tb = tb_htable_lookup(cpu, pc, cs_base, flags, cf_mask);
if (likely(tb == NULL)) { if (likely(tb == NULL)) {
/* if no translated code available, then translate it now */ /* if no translated code available, then translate it now */
tb = tb_gen_code(cpu, pc, cs_base, flags, 0); tb = tb_gen_code(cpu, pc, cs_base, flags, cf_mask);
} }
mmap_unlock(); mmap_unlock();
@ -472,20 +473,21 @@ static void cpu_exec_step(struct uc_struct *uc, CPUState *cpu)
TranslationBlock *tb; TranslationBlock *tb;
target_ulong cs_base, pc; target_ulong cs_base, pc;
uint32_t flags; uint32_t flags;
uint32_t cflags = 1 | CF_IGNORE_ICOUNT;
cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags); cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags);
if (sigsetjmp(cpu->jmp_env, 0) == 0) { if (sigsetjmp(cpu->jmp_env, 0) == 0) {
mmap_lock(); tb = tb_lookup__cpu_state(cpu, &pc, &cs_base, &flags,
tb = tb_gen_code(cpu, pc, cs_base, flags, cflags & CF_HASH_MASK);
1 | CF_NOCACHE | CF_IGNORE_ICOUNT); if (tb == NULL) {
tb->orig_tb = NULL; mmap_lock();
mmap_unlock(); tb = tb_gen_code(cpu, pc, cs_base, flags, cflags);
mmap_unlock();
}
/* execute the generated code */ /* execute the generated code */
cpu_tb_exec(cpu, tb); cpu_tb_exec(cpu, tb);
tb_phys_invalidate(uc, tb, -1);
tb_free(uc, tb);
} else { } else {
/* We may have exited due to another problem here, so we need /* We may have exited due to another problem here, so we need
* to reset any tb_locks we may have taken but didn't release. * to reset any tb_locks we may have taken but didn't release.

2
qemu/accel/tcg/tcg-runtime.c
View file

@ -151,7 +151,7 @@ void *HELPER(lookup_tb_ptr)(CPUArchState *env)
target_ulong cs_base, pc; target_ulong cs_base, pc;
uint32_t flags; uint32_t flags;
tb = tb_lookup__cpu_state(cpu, &pc, &cs_base, &flags); tb = tb_lookup__cpu_state(cpu, &pc, &cs_base, &flags, curr_cflags(env->uc));
if (tb == NULL) { if (tb == NULL) {
return tcg_ctx->code_gen_epilogue; return tcg_ctx->code_gen_epilogue;
} }

17
qemu/accel/tcg/translate-all.c
View file

@ -1147,7 +1147,7 @@ void tb_phys_invalidate(struct uc_struct *uc,
/* remove the TB from the hash list */ /* remove the TB from the hash list */
phys_pc = tb->page_addr[0] + (tb->pc & ~TARGET_PAGE_MASK); phys_pc = tb->page_addr[0] + (tb->pc & ~TARGET_PAGE_MASK);
h = tb_hash_func(phys_pc, tb->pc, tb->flags); h = tb_hash_func(phys_pc, tb->pc, tb->flags, tb->cflags & CF_HASH_MASK);
tb_hash_remove(&tcg_ctx->tb_ctx.tb_phys_hash[h], tb); tb_hash_remove(&tcg_ctx->tb_ctx.tb_phys_hash[h], tb);
/* remove the TB from the page list */ /* remove the TB from the page list */
@ -1304,7 +1304,7 @@ static void tb_link_page(struct uc_struct *uc,
} }
/* add in the hash table */ /* add in the hash table */
h = tb_hash_func(phys_pc, tb->pc, tb->flags); h = tb_hash_func(phys_pc, tb->pc, tb->flags, tb->cflags & CF_HASH_MASK);
ptb = &tcg_ctx->tb_ctx.tb_phys_hash[h]; ptb = &tcg_ctx->tb_ctx.tb_phys_hash[h];
tb->phys_hash_next = *ptb; tb->phys_hash_next = *ptb;
*ptb = tb; *ptb = tb;
@ -1658,7 +1658,8 @@ void tb_invalidate_phys_page_range(struct uc_struct *uc, tb_page_addr_t start, t
/* we generate a block containing just the instruction /* we generate a block containing just the instruction
modifying the memory. It will ensure that it cannot modify modifying the memory. It will ensure that it cannot modify
itself */ itself */
tb_gen_code(uc->cpu, current_pc, current_cs_base, current_flags, 1); tb_gen_code(uc->cpu, current_pc, current_cs_base, current_flags,
1 | curr_cflags(uc));
cpu_loop_exit_noexc(uc->cpu); cpu_loop_exit_noexc(uc->cpu);
} }
#endif #endif
@ -1714,7 +1715,7 @@ void tb_invalidate_phys_page_fast(struct uc_struct* uc, tb_page_addr_t start, in
* TB (because it was modified by this store and the guest CPU has * TB (because it was modified by this store and the guest CPU has
* precise-SMC semantics). * precise-SMC semantics).
*/ */
static bool tb_invalidate_phys_page(tb_page_addr_t addr, uintptr_t pc) static bool tb_invalidate_phys_page(struct uc_struct *uc, tb_page_addr_t addr, uintptr_t pc)
{ {
TranslationBlock *tb; TranslationBlock *tb;
PageDesc *p; PageDesc *p;
@ -1770,7 +1771,8 @@ static bool tb_invalidate_phys_page(tb_page_addr_t addr, uintptr_t pc)
/* we generate a block containing just the instruction /* we generate a block containing just the instruction
modifying the memory. It will ensure that it cannot modify modifying the memory. It will ensure that it cannot modify
itself */ itself */
tb_gen_code(cpu, current_pc, current_cs_base, current_flags, 1); tb_gen_code(cpu, current_pc, current_cs_base, current_flags,
1 | curr_cflags(uc));
return true; return true;
} }
#endif #endif
@ -1903,6 +1905,7 @@ void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr)
} }
cflags = n | CF_LAST_IO; cflags = n | CF_LAST_IO;
cflags |= curr_cflags(cpu->uc);
pc = tb->pc; pc = tb->pc;
cs_base = tb->cs_base; cs_base = tb->cs_base;
flags = tb->flags; flags = tb->flags;
@ -2177,7 +2180,7 @@ static void page_set_flags(struct uc_struct *uc, target_ulong start, target_ulon
if (!(p->flags & PAGE_WRITE) && if (!(p->flags & PAGE_WRITE) &&
(flags & PAGE_WRITE) && (flags & PAGE_WRITE) &&
p->first_tb) { p->first_tb) {
tb_invalidate_phys_page(addr, 0); tb_invalidate_phys_page(uc, addr, 0);
} }
p->flags = flags; p->flags = flags;
} }
@ -2277,7 +2280,7 @@ int page_unprotect(struct uc_struct *uc, target_ulong address, uintptr_t pc)
/* and since the content will be modified, we must invalidate /* and since the content will be modified, we must invalidate
the corresponding translated code. */ the corresponding translated code. */
current_tb_invalidated |= tb_invalidate_phys_page(addr, pc); current_tb_invalidated |= tb_invalidate_phys_page(uc, addr, pc);
#ifdef CONFIG_USER_ONLY #ifdef CONFIG_USER_ONLY
if (DEBUG_TB_CHECK_GATE) { if (DEBUG_TB_CHECK_GATE) {
tb_invalidate_check(addr); tb_invalidate_check(addr);

14
qemu/include/exec/exec-all.h
View file

@ -23,6 +23,8 @@
#include "qemu-common.h" #include "qemu-common.h"
#include "exec/tb-context.h" #include "exec/tb-context.h"
#include "uc_priv.h"
/* allow to see translation results - the slowdown should be negligible, so we leave it */ /* allow to see translation results - the slowdown should be negligible, so we leave it */
#define DEBUG_DISAS #define DEBUG_DISAS
@ -248,6 +250,9 @@ struct TranslationBlock {
#define CF_USE_ICOUNT 0x20000 #define CF_USE_ICOUNT 0x20000
#define CF_IGNORE_ICOUNT 0x40000 /* Do not generate icount code */ #define CF_IGNORE_ICOUNT 0x40000 /* Do not generate icount code */
#define CF_INVALID 0x80000 /* TB is stale. Setters must acquire tb_lock */ #define CF_INVALID 0x80000 /* TB is stale. Setters must acquire tb_lock */
#define CF_PARALLEL 0x100000 /* Generate code for a parallel context */
/* cflags' mask for hashing/comparison */
#define CF_HASH_MASK (CF_PARALLEL)
struct tb_tc tc; struct tb_tc tc;
/* next matching tb for physical address. */ /* next matching tb for physical address. */
@ -292,12 +297,19 @@ static inline uint32_t tb_cflags(const TranslationBlock *tb)
return atomic_read(&tb->cflags); return atomic_read(&tb->cflags);
} }
/* current cflags for hashing/comparison */
static inline uint32_t curr_cflags(struct uc_struct *uc)
{
return uc->parallel_cpus ? CF_PARALLEL : 0;
}
void tb_free(struct uc_struct *uc, TranslationBlock *tb); void tb_free(struct uc_struct *uc, TranslationBlock *tb);
void tb_flush(CPUState *cpu); void tb_flush(CPUState *cpu);
void tb_phys_invalidate(struct uc_struct *uc, void tb_phys_invalidate(struct uc_struct *uc,
TranslationBlock *tb, tb_page_addr_t page_addr); TranslationBlock *tb, tb_page_addr_t page_addr);
TranslationBlock *tb_htable_lookup(CPUState *cpu, target_ulong pc, TranslationBlock *tb_htable_lookup(CPUState *cpu, target_ulong pc,
target_ulong cs_base, uint32_t flags); target_ulong cs_base, uint32_t flags,
uint32_t cf_mask);
void tb_set_jmp_target(TranslationBlock *tb, int n, uintptr_t addr); void tb_set_jmp_target(TranslationBlock *tb, int n, uintptr_t addr);

5
qemu/include/exec/tb-hash.h
View file

@ -59,9 +59,10 @@ static inline unsigned int tb_jmp_cache_hash_func(target_ulong pc)
} }
static inline static inline
uint32_t tb_hash_func(tb_page_addr_t phys_pc, target_ulong pc, uint32_t flags) uint32_t tb_hash_func(tb_page_addr_t phys_pc, target_ulong pc, uint32_t flags,
uint32_t cf_mask)
{ {
return qemu_xxhash7(phys_pc, pc, flags, 0, 0) & (CODE_GEN_PHYS_HASH_SIZE - 1); return qemu_xxhash7(phys_pc, pc, flags, cf_mask, 0) & (CODE_GEN_PHYS_HASH_SIZE - 1);
} }
#endif #endif

6
qemu/include/exec/tb-lookup.h
View file

@ -19,7 +19,7 @@
/* Might cause an exception, so have a longjmp destination ready */ /* Might cause an exception, so have a longjmp destination ready */
static inline TranslationBlock * static inline TranslationBlock *
tb_lookup__cpu_state(CPUState *cpu, target_ulong *pc, target_ulong *cs_base, tb_lookup__cpu_state(CPUState *cpu, target_ulong *pc, target_ulong *cs_base,
uint32_t *flags) uint32_t *flags, uint32_t cf_mask)
{ {
CPUArchState *env = (CPUArchState *)cpu->env_ptr; CPUArchState *env = (CPUArchState *)cpu->env_ptr;
TranslationBlock *tb; TranslationBlock *tb;
@ -32,10 +32,10 @@ tb_lookup__cpu_state(CPUState *cpu, target_ulong *pc, target_ulong *cs_base,
tb->pc == *pc && tb->pc == *pc &&
tb->cs_base == *cs_base && tb->cs_base == *cs_base &&
tb->flags == *flags && tb->flags == *flags &&
!(tb_cflags(tb) & CF_INVALID))) { (tb_cflags(tb) & (CF_HASH_MASK | CF_INVALID)) == cf_mask)) {
return tb; return tb;
} }
tb = tb_htable_lookup(cpu, *pc, *cs_base, *flags); tb = tb_htable_lookup(cpu, *pc, *cs_base, *flags, cf_mask);
if (tb == NULL) { if (tb == NULL) {
return NULL; return NULL;
} }