Measure Tiny Code Generation Quality
v6 cover Measure Tiny Code Generation Quality
This patch is part of Google Summer of Code (GSoC) 2019. More about the project can be found in:
https://wiki.qemu.org/Internships/ProjectIdeas/TCGCodeQuality
The goal of this patch is to add infrastructure to collect execution and JIT statistics during the emulation with accel/TCG. The statistics are stored in TBStatistic structures (TBStats) with each TB having its respective TBStats.
We added -d tb_stats and HMP tb_stats commands to allow the control of this statistics collection. And info tb, tbs, and coverset commands were also added to allow dumping and exploring all this information while emulating.
Collecting these statistics and information is useful to understand qemu performance and to help to add the support for traces to QEMU.
v6:
- applying comments from V5.
- change info tbs to info tb-list
- fix crash when dumping tb's targets
- fix "liveness/code time" calculation
v5:
- full replacement of CONFIG_PROFILER
- several fixes
- adds "info cfg"
- adds TB's targets to dump
vandersonmr (10):
accel: introducing TBStatistics structure
accel: collecting TB execution count
accel: collecting JIT statistics
accel: replacing part of CONFIG_PROFILER with TBStats
accel: adding TB_JIT_TIME and full replacing CONFIG_PROFILER
log: adding -d tb_stats to control tbstats
monitor: adding tb_stats hmp command
Adding info [tb-list|tb|coverset] commands to HMP.
monitor: adding new info cfg command
linux-user: dumping hot TBs at the end of the execution
accel/tcg/Makefile.objs | 2 +- accel/tcg/cpu-exec.c | 4 + accel/tcg/perf/Makefile.objs | 1 + accel/tcg/tb-stats.c | 877 +++++++++++++++++++++++++++++++++++ accel/tcg/tcg-runtime.c | 7 + accel/tcg/tcg-runtime.h | 2 + accel/tcg/translate-all.c | 132 ++++-- accel/tcg/translator.c | 6 + configure | 3 - cpus.c | 14 +- disas.c | 31 +- hmp-commands-info.hx | 31 ++ hmp-commands.hx | 17 + include/exec/exec-all.h | 15 +- include/exec/gen-icount.h | 10 + include/exec/tb-context.h | 12 + include/exec/tb-hash.h | 7 + include/exec/tb-stats.h | 144 ++++++ include/qemu-common.h | 16 + include/qemu/log-for-trace.h | 4 + include/qemu/log.h | 3 + include/qemu/timer.h | 5 +- linux-user/exit.c | 4 + monitor/misc.c | 171 ++++++- tcg/tcg.c | 231 +++------ tcg/tcg.h | 22 +- util/log.c | 90 +++- vl.c | 8 +- 28 files changed, 1585 insertions(+), 284 deletions(-) create mode 100644 accel/tcg/perf/Makefile.objs create mode 100644 accel/tcg/tb-stats.c create mode 100644 include/exec/tb-stats.h
Signature · 1 line
2.22.0
PATCH v6 1/10 accel: introducing TBStatistics structure
To store statistics for each TB, we created a TBStatistics structure which is linked with the TBs. TBStatistics can stay alive after tb_flush and be relinked to a regenerated TB. So the statistics can be accumulated even through flushes.
The goal is to have all present and future qemu/tcg statistics and meta-data stored in this new structure.
--- accel/tcg/Makefile.objs | 2 +- accel/tcg/perf/Makefile.objs | 1 + accel/tcg/tb-stats.c | 39 ++++++++++++++++++++++++ accel/tcg/translate-all.c | 57 ++++++++++++++++++++++++++++++++++++ include/exec/exec-all.h | 15 +++------- include/exec/tb-context.h | 12 ++++++++ include/exec/tb-hash.h | 7 +++++ include/exec/tb-stats.h | 43 +++++++++++++++++++++++++++ util/log.c | 2 ++ 9 files changed, 166 insertions(+), 12 deletions(-) create mode 100644 accel/tcg/perf/Makefile.objs create mode 100644 accel/tcg/tb-stats.c create mode 100644 include/exec/tb-stats.h
accel/tcg/Makefile.objs +1 -1
@@ -2,7 +2,7 @@ obj-$(CONFIG_SOFTMMU) += tcg-all.o obj-$(CONFIG_SOFTMMU) += cputlb.o obj-y += tcg-runtime.o tcg-runtime-gvec.o obj-y += cpu-exec.o cpu-exec-common.o translate-all.o -obj-y += translator.o +obj-y += translator.o tb-stats.o obj-$(CONFIG_USER_ONLY) += user-exec.o obj-$(call lnot,$(CONFIG_SOFTMMU)) += user-exec-stub.o
accel/tcg/perf/Makefile.objs new file +1 -0
@@ -0,0 +1 @@ +obj-y += jitdump.o
accel/tcg/tb-stats.c new file +39 -0
@@ -0,0 +1,39 @@ +#include "qemu/osdep.h" + +#include "disas/disas.h" + +#include "exec/tb-stats.h" + +void init_tb_stats_htable_if_not (void ) +{ +if (tb_stats_collection_enabled () && !tb_ctx.tb_stats.map) { +qht_init (&tb_ctx.tb_stats, tb_stats_cmp, +CODE_GEN_HTABLE_SIZE ,QHT_MODE_AUTO_RESIZE ); + } +} + +void enable_collect_tb_stats (void ) +{ +init_tb_stats_htable_if_not (); + tcg_collect_tb_stats =TB_STATS_RUNNING ; +} + +void disable_collect_tb_stats (void ) +{ + tcg_collect_tb_stats =TB_STATS_PAUSED ; +} + +void pause_collect_tb_stats (void ) +{ + tcg_collect_tb_stats =TB_STATS_STOPPED ; +} + +bool tb_stats_collection_enabled (void ) +{ +return tcg_collect_tb_stats ==TB_STATS_RUNNING ; +} + +bool tb_stats_collection_paused (void ) +{ +return tcg_collect_tb_stats ==TB_STATS_PAUSED ; +}
accel/tcg/translate-all.c +57 -0
81 lines not on this page · raw message
include/exec/exec-all.h +4 -11
@@ -22,21 +22,11 @@#include "exec/tb-context.h" #include "sysemu/cpus.h" +#include "exec/tb-stats.h" /* allow to see translation results - the slowdown should be negligible, so we leave it */ #define DEBUG_DISAS -/* Page tracking code uses ram addresses in system mode, and virtual -addresses in userspace mode. Define tb_page_addr_t to be an appropriate -type. */ -#if defined(CONFIG_USER_ONLY ) -typedef abi_ulong tb_page_addr_t ; -#define TB_PAGE_ADDR_FMT TARGET_ABI_FMT_lx -#else -typedef ram_addr_t tb_page_addr_t ; -#define TB_PAGE_ADDR_FMT RAM_ADDR_FMT -#endif -#include "qemu/log.h" void gen_intermediate_code (CPUState *cpu,TranslationBlock *tb,int max_insns);
@@ -403,6 +393,9 @@ struct TranslationBlock {uintptr_t jmp_list_head;uintptr_t jmp_list_next[2 ];uintptr_t jmp_dest[2 ]; + +/* Pointer to a struct where statistics from the TB is stored */ +TBStatistics *tb_stats; };extern bool parallel_cpus;
include/exec/tb-context.h +12 -0
@@ -23,6 +23,17 @@#include "qemu/thread.h" #include "qemu/qht.h" +/* Page tracking code uses ram addresses in system mode, and virtual +addresses in userspace mode. Define tb_page_addr_t to be an appropriate +type. */ +#if defined(CONFIG_USER_ONLY ) +typedef abi_ulong tb_page_addr_t ; +#define TB_PAGE_ADDR_FMT TARGET_ABI_FMT_lx +#else +typedef ram_addr_t tb_page_addr_t ; +#define TB_PAGE_ADDR_FMT RAM_ADDR_FMT +#endif +#define CODE_GEN_HTABLE_BITS 15#define CODE_GEN_HTABLE_SIZE (1 << CODE_GEN_HTABLE_BITS)
@@ -35,6 +46,7 @@ struct TBContext {/* statistics */ unsigned tb_flush_count; +struct qht tb_stats; };extern TBContext tb_ctx;
include/exec/tb-hash.h +7 -0
@@ -64,4 +64,11 @@ uint32_t tb_hash_func(tb_page_addr_t phys_pc, target_ulong pc, uint32_t flags, return qemu_xxhash7(phys_pc, pc, flags, cf_mask, trace_vcpu_dstate); } +static inline +uint32_t tb_stats_hash_func (tb_page_addr_t phys_pc,target_ulong pc, +uint32_t flags) +{ +return qemu_xxhash5 (phys_pc, pc, flags); +} +#endif
include/exec/tb-stats.h new file +43 -0
43 lines not on this page · raw message
util/log.c +2 -0
@@ -31,6 +31,8 @@ int qemu_loglevel;static int log_append =0 ;static GArray *debug_regions; +int tcg_collect_tb_stats; +/* Return the number of characters emitted. */ int qemu_log (const char *fmt, ...) {
Signature · 1 line
2.22.0
Re: [Qemu-devel] [PATCH v6 01/10] accel: introducing TBStatistics structure
accel/tcg/tb-stats.c
Quoted 51 lines · vandersonmr
To store statistics for each TB, we created a TBStatistics structure which is linked with the TBs. TBStatistics can stay alive after
tb_flushand be relinked to a regenerated TB. So the statistics can be accumulated even through flushes.The goal is to have all present and future qemu/tcg statistics and meta-data stored in this new structure.
Reviewed-by Alex Bennée <[email protected]>Signed-off-by Vanderson M. do Rosario <[email protected]>--- accel/tcg/Makefile.objs | 2 +- accel/tcg/perf/Makefile.objs | 1 + accel/tcg/tb-stats.c | 39 ++++++++++++++++++++++++ accel/tcg/translate-all.c | 57 ++++++++++++++++++++++++++++++++++++ include/exec/exec-all.h | 15 +++------- include/exec/tb-context.h | 12 ++++++++ include/exec/tb-hash.h | 7 +++++ include/exec/tb-stats.h | 43 +++++++++++++++++++++++++++ util/log.c | 2 ++ 9 files changed, 166 insertions(+), 12 deletions(-) create mode 100644 accel/tcg/perf/Makefile.objs create mode 100644 accel/tcg/tb-stats.c create mode 100644 include/exec/tb-stats.haccel/tcg/Makefile.objs +1
-1@@ -2,7 +2,7 @@ obj-$(CONFIG_SOFTMMU) += tcg-all.o obj-$(CONFIG_SOFTMMU) += cputlb.o obj-y += tcg-runtime.o tcg-runtime-gvec.o obj-y += cpu-exec.o cpu-exec-common.o translate-all.o -obj-y += translator.o +obj-y += translator.o tb-stats.o obj-$(CONFIG_USER_ONLY) += user-exec.o obj-$(call lnot,$(CONFIG_SOFTMMU)) += user-exec-stub.oaccel/tcg/perf/Makefile.objs new file +1
-0@@ -0,0 +1 @@ +obj-y += jitdump.oaccel/tcg/tb-stats.c new file +0
-0@@ -0,0 +1,39 @@
I should have picked up on this last time but you need a copyright header for you new files.
Quoted 6 lines
accel/tcg/tb-stats.c new file +6
-0+#include "qemu/osdep.h" + +#include "disas/disas.h" + +#include "exec/tb-stats.h" +
<snip>
include/exec/tb-stats.h
Quoted 6 lines
include/exec/tb-stats.h new file +0
-0@@ -0,0 +1,43 @@
And a copyright header here as well.
Quoted 48 lines
include/exec/tb-stats.h new file +43
-0+#ifndef TB_STATS_H + +#define TB_STATS_H + +#include "exec/cpu-common.h" +#include "exec/tb-context.h" +#include "tcg.h" + +typedef struct TBStatistics TBStatistics ; + +/* +* This struct stores statistics such as execution count of the +* TranslationBlocks. Each sets of TBs for a given phys_pc/pc/flags +* has its own TBStatistics which will persist over tb_flush. +* +* We include additional counters to track number of translations as +* well as variants for compile flags. +*/ +struct TBStatistics { +tb_page_addr_t phys_pc; +target_ulong pc; +uint32_t flags; +/* cs_base isn't included in the hash but we do check for matches */ +target_ulong cs_base; +/* current TB linked to this TBStatistics */ +TranslationBlock *tb; +}; + +bool tb_stats_cmp (const void *ap,const void *bp); + +void init_tb_stats_htable_if_not (void ); + +/* TBStatistic collection controls */ +enum TBStatsStatus {TB_STATS_RUNNING ,TB_STATS_PAUSED ,TB_STATS_STOPPED }; +extern int tcg_collect_tb_stats; + +void enable_collect_tb_stats (void ); +void disable_collect_tb_stats (void ); +void pause_collect_tb_stats (void ); +bool tb_stats_collection_enabled (void ); +bool tb_stats_collection_paused (void ); + +#endif util/log.c +0
-0
util/log.c int qemu_loglevel; · line 38
Quoted 8 lines
util/log.c +2
-0@@ -31,6 +31,8 @@ int qemu_loglevel;static int log_append =0 ;static GArray *debug_regions; +int tcg_collect_tb_stats; +/* Return the number of characters emitted. */ int qemu_log (const char *fmt, ...) {
--
Alex Bennée
Re: [Qemu-devel] [PATCH v6 01/10] accel: introducing TBStatistics structure
In reply to vandersonmrQuoted 5 lines · vandersonmr
To store statistics for each TB, we created a TBStatistics structure which is linked with the TBs. TBStatistics can stay alive after
tb_flushand be relinked to a regenerated TB. So the statistics can be accumulated even through flushes.
Quoted 8 lines
The goal is to have all present and future qemu/tcg statistics and meta-data stored in this new structure.
Reviewed-by Alex Bennée <[email protected]>Signed-off-by Vanderson M. do Rosario <[email protected]>--- accel/tcg/Makefile.objs | 2 +- accel/tcg/perf/Makefile.objs | 1 +
Also I think the jitdump thing is a mismerge from the jit patches.
Quoted 303 lines
accel/tcg/tb-stats.c | 39 ++++++++++++++++++++++++ accel/tcg/translate-all.c | 57 ++++++++++++++++++++++++++++++++++++ include/exec/exec-all.h | 15 +++------- include/exec/tb-context.h | 12 ++++++++ include/exec/tb-hash.h | 7 +++++ include/exec/tb-stats.h | 43 +++++++++++++++++++++++++++ util/log.c | 2 ++ 9 files changed, 166 insertions(+), 12 deletions(-) create mode 100644 accel/tcg/perf/Makefile.objs create mode 100644 accel/tcg/tb-stats.c create mode 100644 include/exec/tb-stats.haccel/tcg/Makefile.objs +1
-1@@ -2,7 +2,7 @@ obj-$(CONFIG_SOFTMMU) += tcg-all.o obj-$(CONFIG_SOFTMMU) += cputlb.o obj-y += tcg-runtime.o tcg-runtime-gvec.o obj-y += cpu-exec.o cpu-exec-common.o translate-all.o -obj-y += translator.o +obj-y += translator.o tb-stats.o obj-$(CONFIG_USER_ONLY) += user-exec.o obj-$(call lnot,$(CONFIG_SOFTMMU)) += user-exec-stub.oaccel/tcg/perf/Makefile.objs new file +1
-0@@ -0,0 +1 @@ +obj-y += jitdump.oaccel/tcg/tb-stats.c new file +39
-0@@ -0,0 +1,39 @@ +#include "qemu/osdep.h" + +#include "disas/disas.h" + +#include "exec/tb-stats.h" + +void init_tb_stats_htable_if_not (void ) +{ +if (tb_stats_collection_enabled () && !tb_ctx.tb_stats.map) { +qht_init (&tb_ctx.tb_stats, tb_stats_cmp, +CODE_GEN_HTABLE_SIZE ,QHT_MODE_AUTO_RESIZE ); + } +} + +void enable_collect_tb_stats (void ) +{ +init_tb_stats_htable_if_not (); + tcg_collect_tb_stats =TB_STATS_RUNNING ; +} + +void disable_collect_tb_stats (void ) +{ + tcg_collect_tb_stats =TB_STATS_PAUSED ; +} + +void pause_collect_tb_stats (void ) +{ + tcg_collect_tb_stats =TB_STATS_STOPPED ; +} + +bool tb_stats_collection_enabled (void ) +{ +return tcg_collect_tb_stats ==TB_STATS_RUNNING ; +} + +bool tb_stats_collection_paused (void ) +{ +return tcg_collect_tb_stats ==TB_STATS_PAUSED ; +}accel/tcg/translate-all.c +57
-0@@ -1118,6 +1118,23 @@ static inline void code_gen_alloc(size_t tb_size) } } +/* +* This is the more or less the same compare as tb_cmp(), but the +* data persists over tb_flush. We also aggregate the various +* variations of cflags under one record and ignore the details of +* page overlap (although we can count it). +*/ +bool tb_stats_cmp (const void *ap,const void *bp) +{ +const TBStatistics *a = ap; +const TBStatistics *b = bp; + +return a->phys_pc == b->phys_pc && + a->pc == b->pc && + a->cs_base == b->cs_base && + a->flags == b->flags; +} +static bool tb_cmp (const void *ap,const void *bp) {const TranslationBlock *a = ap;@@ -1137,6 +1154,7 @@ static void tb_htable_init(void)unsigned int mode =QHT_MODE_AUTO_RESIZE ;qht_init (&tb_ctx.htable, tb_cmp,CODE_GEN_HTABLE_SIZE , mode); +init_tb_stats_htable_if_not (); }/* Must be called before using the QEMU cpus. 'tb_size' is the size @@ -1666,6 +1684,34 @@ tb_link_page(TranslationBlock *tb, tb_page_addr_t phys_pc,return tb; } +static TBStatistics *tb_get_stats (tb_page_addr_t phys_pc,target_ulong pc, +target_ulong cs_base,uint32_t flags, +TranslationBlock *current_tb) +{ +TBStatistics *new_stats =g_new0 (TBStatistics,1 ); +uint32_t hash =tb_stats_hash_func (phys_pc, pc, flags); +void *existing_stats =NULL ; + new_stats->phys_pc = phys_pc; + new_stats->pc = pc; + new_stats->cs_base = cs_base; + new_stats->flags = flags; + new_stats->tb = current_tb; + +qht_insert (&tb_ctx.tb_stats, new_stats, hash, &existing_stats); + +if (unlikely (existing_stats)) { +/* +* If there is already a TBStatistic for this TB from a previous flush +* then just make the new TB point to the older TBStatistic +*/ +g_free (new_stats); +return existing_stats; + }else { +return new_stats; + } +} + +/* Called with mmap_lock held for user mode emulation. */ TranslationBlock *tb_gen_code(CPUState *cpu, target_ulong pc, target_ulong cs_base,@@ -1732,6 +1778,17 @@ TranslationBlock *tb_gen_code(CPUState *cpu, ti =profile_getclock ();#endif +/* +* We want to fetch the stats structure before we start code +* generation so we can count interesting things about this +* generation. +*/ +if (tb_stats_collection_enabled ()) { + tb->tb_stats =tb_get_stats (phys_pc, pc, cs_base, flags, tb); + }else { + tb->tb_stats =NULL ; + } +tcg_func_start (tcg_ctx); tcg_ctx->cpu =env_cpu (env);include/exec/exec-all.h +4
-11@@ -22,21 +22,11 @@#include "exec/tb-context.h" #include "sysemu/cpus.h" +#include "exec/tb-stats.h" /* allow to see translation results - the slowdown should be negligible, so we leave it */ #define DEBUG_DISAS -/* Page tracking code uses ram addresses in system mode, and virtual -addresses in userspace mode. Define tb_page_addr_t to be an appropriate -type. */ -#if defined(CONFIG_USER_ONLY ) -typedef abi_ulong tb_page_addr_t ; -#define TB_PAGE_ADDR_FMT TARGET_ABI_FMT_lx -#else -typedef ram_addr_t tb_page_addr_t ; -#define TB_PAGE_ADDR_FMT RAM_ADDR_FMT -#endif -#include "qemu/log.h" void gen_intermediate_code (CPUState *cpu,TranslationBlock *tb,int max_insns);@@ -403,6 +393,9 @@ struct TranslationBlock {uintptr_t jmp_list_head;uintptr_t jmp_list_next[2 ];uintptr_t jmp_dest[2 ]; + +/* Pointer to a struct where statistics from the TB is stored */ +TBStatistics *tb_stats; };extern bool parallel_cpus;include/exec/tb-context.h +12
-0@@ -23,6 +23,17 @@#include "qemu/thread.h" #include "qemu/qht.h" +/* Page tracking code uses ram addresses in system mode, and virtual +addresses in userspace mode. Define tb_page_addr_t to be an appropriate +type. */ +#if defined(CONFIG_USER_ONLY ) +typedef abi_ulong tb_page_addr_t ; +#define TB_PAGE_ADDR_FMT TARGET_ABI_FMT_lx +#else +typedef ram_addr_t tb_page_addr_t ; +#define TB_PAGE_ADDR_FMT RAM_ADDR_FMT +#endif +#define CODE_GEN_HTABLE_BITS 15#define CODE_GEN_HTABLE_SIZE (1 << CODE_GEN_HTABLE_BITS)@@ -35,6 +46,7 @@ struct TBContext {/* statistics */ unsigned tb_flush_count; +struct qht tb_stats; };extern TBContext tb_ctx;include/exec/tb-hash.h +7
-0@@ -64,4 +64,11 @@ uint32_t tb_hash_func(tb_page_addr_t phys_pc, target_ulong pc, uint32_t flags, return qemu_xxhash7(phys_pc, pc, flags, cf_mask, trace_vcpu_dstate); } +static inline +uint32_t tb_stats_hash_func (tb_page_addr_t phys_pc,target_ulong pc, +uint32_t flags) +{ +return qemu_xxhash5 (phys_pc, pc, flags); +} +#endif include/exec/tb-stats.h new file +43
-0@@ -0,0 +1,43 @@ +#ifndef TB_STATS_H + +#define TB_STATS_H + +#include "exec/cpu-common.h" +#include "exec/tb-context.h" +#include "tcg.h" + +typedef struct TBStatistics TBStatistics ; + +/* +* This struct stores statistics such as execution count of the +* TranslationBlocks. Each sets of TBs for a given phys_pc/pc/flags +* has its own TBStatistics which will persist over tb_flush. +* +* We include additional counters to track number of translations as +* well as variants for compile flags. +*/ +struct TBStatistics { +tb_page_addr_t phys_pc; +target_ulong pc; +uint32_t flags; +/* cs_base isn't included in the hash but we do check for matches */ +target_ulong cs_base; +/* current TB linked to this TBStatistics */ +TranslationBlock *tb; +}; + +bool tb_stats_cmp (const void *ap,const void *bp); + +void init_tb_stats_htable_if_not (void ); + +/* TBStatistic collection controls */ +enum TBStatsStatus {TB_STATS_RUNNING ,TB_STATS_PAUSED ,TB_STATS_STOPPED }; +extern int tcg_collect_tb_stats; + +void enable_collect_tb_stats (void ); +void disable_collect_tb_stats (void ); +void pause_collect_tb_stats (void ); +bool tb_stats_collection_enabled (void ); +bool tb_stats_collection_paused (void ); + +#endif util/log.c +0
-0
util/log.c int qemu_loglevel; · line 38
Quoted 8 lines
util/log.c +2
-0@@ -31,6 +31,8 @@ int qemu_loglevel;static int log_append =0 ;static GArray *debug_regions; +int tcg_collect_tb_stats; +/* Return the number of characters emitted. */ int qemu_log (const char *fmt, ...) {
--
Alex Bennée
PATCH v6 2/10 accel: collecting TB execution count
In reply to vandersonmrIf a TB has a TBS (TBStatistics) with the TB_EXEC_STATS enabled, then we instrument the start code of this TB to atomically count the number of times it is executed. We count both the number of "normal" executions and atomic executions of a TB.
The execution count of the TB is stored in its respective TBS.
All TBStatistics are created by default with the flags from default_tbstats_flag.
--- accel/tcg/cpu-exec.c | 4 ++++ accel/tcg/tb-stats.c | 5 +++++ accel/tcg/tcg-runtime.c | 7 +++++++ accel/tcg/tcg-runtime.h | 2 ++ accel/tcg/translate-all.c | 7 +++++++ accel/tcg/translator.c | 1 + include/exec/gen-icount.h | 9 +++++++++ include/exec/tb-stats.h | 19 +++++++++++++++++++ util/log.c | 1 + 9 files changed, 55 insertions(+)
accel/tcg/cpu-exec.c +4 -0
@@ -252,6 +252,10 @@ void cpu_exec_step_atomic(CPUState *cpu)start_exclusive (); +if (tb_stats_enabled (tb,TB_EXEC_STATS )) { + tb->tb_stats->executions.atomic++; + } +/* Since we got here, we know that parallel_cpus must be true. */ parallel_cpus = false; in_exclusive_region = true;
accel/tcg/tb-stats.c +5 -0
@@ -37,3 +37,8 @@ bool tb_stats_collection_paused(void) {return tcg_collect_tb_stats ==TB_STATS_PAUSED ; } + +uint32_t get_default_tbstats_flag (void ) +{ +return default_tbstats_flag; +}
accel/tcg/tcg-runtime.c +7 -0
@@ -167,3 +167,10 @@ void HELPER(exit_atomic)(CPUArchState *env) {cpu_loop_exit_atomic (env_cpu (env),GETPC ()); } + +void HELPER (inc_exec_freq )(void *ptr) +{ +TBStatistics *stats = (TBStatistics *) ptr; +g_assert (stats); +atomic_inc (&stats->executions.normal); +}
accel/tcg/tcg-runtime.h +2 -0
@@ -28,6 +28,8 @@ DEF_HELPER_FLAGS_1(lookup_tb_ptr, TCG_CALL_NO_WG_SE, ptr, env) DEF_HELPER_FLAGS_1(exit_atomic, TCG_CALL_NO_WG, noreturn, env) +DEF_HELPER_FLAGS_1(inc_exec_freq, TCG_CALL_NO_RWG, void, ptr) +#ifdef CONFIG_SOFTMMU DEF_HELPER_FLAGS_5(atomic_cmpxchgb, TCG_CALL_NO_WG,
accel/tcg/translate-all.c +7 -0
@@ -1785,6 +1785,13 @@ TranslationBlock *tb_gen_code(CPUState *cpu,*/ if (tb_stats_collection_enabled ()) { tb->tb_stats =tb_get_stats (phys_pc, pc, cs_base, flags, tb); + +if (qemu_log_in_addr_range (tb->pc)) { +uint32_t flag =get_default_tbstats_flag (); +if (flag &TB_EXEC_STATS ) { + tb->tb_stats->stats_enabled |=TB_EXEC_STATS ; + } + } }else { tb->tb_stats =NULL ; }
accel/tcg/translator.c +1 -0
@@ -46,6 +46,7 @@ void translator_loop(const TranslatorOps *ops, DisasContextBase *db, ops->init_disas_context (db, cpu);tcg_debug_assert (db->is_jmp ==DISAS_NEXT );/* no early exit */ +gen_tb_exec_count (tb);/* Reset the temp count so that we can identify leaks */ tcg_clear_temp_count ();
include/exec/gen-icount.h +9 -0
@@ -7,6 +7,15 @@static TCGOp *icount_start_insn; +static inline void gen_tb_exec_count (TranslationBlock *tb) +{ +if (tb_stats_enabled (tb,TB_EXEC_STATS )) { +TCGv_ptr ptr =tcg_const_ptr (tb->tb_stats); +gen_helper_inc_exec_freq (ptr); +tcg_temp_free_ptr (ptr); + } +} +static inline void gen_tb_start (TranslationBlock *tb) {TCGv_i32 count, imm;
include/exec/tb-stats.h +19 -0
@@ -6,6 +6,9 @@#include "exec/tb-context.h" #include "tcg.h" +#define tb_stats_enabled (tb,JIT_STATS ) \ + (tb && tb->tb_stats && (tb->tb_stats->stats_enabled & JIT_STATS)) +typedef struct TBStatistics TBStatistics ;/*
@@ -22,6 +25,15 @@ struct TBStatistics {uint32_t flags;/* cs_base isn't included in the hash but we do check for matches */ target_ulong cs_base; + +uint32_t stats_enabled; + +/* Execution stats */ +struct { +unsigned long normal; +unsigned long atomic; + } executions; +/* current TB linked to this TBStatistics */ TranslationBlock *tb; };
@@ -32,7 +44,12 @@ void init_tb_stats_htable_if_not(void);/* TBStatistic collection controls */ enum TBStatsStatus {TB_STATS_RUNNING ,TB_STATS_PAUSED ,TB_STATS_STOPPED }; + +#define TB_NOTHING (1 << 0) +#define TB_EXEC_STATS (1 << 1) +extern int tcg_collect_tb_stats; +extern uint32_t default_tbstats_flag;void enable_collect_tb_stats (void );void disable_collect_tb_stats (void );
@@ -40,4 +57,6 @@ void pause_collect_tb_stats(void);bool tb_stats_collection_enabled (void );bool tb_stats_collection_paused (void ); +uint32_t get_default_tbstats_flag (void ); +#endif
util/log.c +1 -0
@@ -32,6 +32,7 @@ static int log_append = 0;static GArray *debug_regions;int tcg_collect_tb_stats; +uint32_t default_tbstats_flag;/* Return the number of characters emitted. */ int qemu_log (const char *fmt, ...)
Signature · 1 line
2.22.0
PATCH v6 3/10 accel: collecting JIT statistics
In reply to vandersonmrIf a TB has a TBS (TBStatistics) with the TB_JIT_STATS enabled then we collect statistics of its translation processes and code translation.
Collecting the number of host instructions seems to be not simple as it would imply in having to modify several target source files. So, for now, we are only collecting the size of the host gen code.
--- accel/tcg/translate-all.c | 15 ++++++++++++++- accel/tcg/translator.c | 4 ++++ include/exec/tb-stats.h | 15 +++++++++++++++ tcg/tcg.c | 23 +++++++++++++++++++++++ tcg/tcg.h | 2 ++ 5 files changed, 58 insertions(+), 1 deletion(-)
accel/tcg/translate-all.c +14 -1
@@ -1705,6 +1705,7 @@ static TBStatistics *tb_get_stats(tb_page_addr_t phys_pc, target_ulong pc,* then just make the new TB point to the older TBStatistic */ g_free (new_stats); + ((TBStatistics *) existing_stats)->tb = current_tb;return existing_stats; }else {return new_stats;
@@ -1785,13 +1786,18 @@ TranslationBlock *tb_gen_code(CPUState *cpu,*/ if (tb_stats_collection_enabled ()) { tb->tb_stats =tb_get_stats (phys_pc, pc, cs_base, flags, tb); +uint32_t flag =get_default_tbstats_flag ();if (qemu_log_in_addr_range (tb->pc)) { -uint32_t flag =get_default_tbstats_flag ();if (flag &TB_EXEC_STATS ) { tb->tb_stats->stats_enabled |=TB_EXEC_STATS ; } } + +if (flag &TB_JIT_STATS ) { + tb->tb_stats->stats_enabled |=TB_JIT_STATS ; +atomic_inc (&tb->tb_stats->translations.total); + } }else { tb->tb_stats =NULL ; }
@@ -1869,6 +1875,10 @@ TranslationBlock *tb_gen_code(CPUState *cpu,atomic_set (&prof->search_out_len, prof->search_out_len + search_size);#endif +if (tb_stats_enabled (tb,TB_JIT_STATS )) { +atomic_add (&tb->tb_stats->code.out_len, gen_code_size); + } +#ifdef DEBUG_DISAS if (qemu_loglevel_mask (CPU_LOG_TB_OUT_ASM ) &&qemu_log_in_addr_range (tb->pc)) {
@@ -1926,6 +1936,9 @@ TranslationBlock *tb_gen_code(CPUState *cpu, phys_page2 =-1 ;if ((pc &TARGET_PAGE_MASK ) != virt_page2) { phys_page2 =get_page_addr_code (env, virt_page2); +if (tb_stats_enabled (tb,TB_JIT_STATS )) { +atomic_inc (&tb->tb_stats->translations.spanning); + } }/* * No explicit memory barrier is required -- tb_link_page() makes the
accel/tcg/translator.c +4 -0
@@ -117,6 +117,10 @@ void translator_loop(const TranslatorOps *ops, DisasContextBase *db, db->tb->size = db->pc_next - db->pc_first; db->tb->icount = db->num_insns; +if (tb_stats_enabled (tb,TB_JIT_STATS )) { +atomic_add (&db->tb->tb_stats->code.num_guest_inst, db->num_insns); + } +#ifdef DEBUG_DISAS if (qemu_loglevel_mask (CPU_LOG_TB_IN_ASM ) &&qemu_log_in_addr_range (db->pc_first)) {
include/exec/tb-stats.h +15 -0
@@ -34,6 +34,20 @@ struct TBStatistics {unsigned long atomic; } executions; +struct { +unsigned num_guest_inst; +unsigned num_tcg_ops; +unsigned num_tcg_ops_opt; +unsigned spills; +unsigned out_len; + } code; + +struct { +unsigned long total; +unsigned long uncached; +unsigned long spanning; + } translations; +/* current TB linked to this TBStatistics */ TranslationBlock *tb; };
@@ -47,6 +61,7 @@ enum TBStatsStatus { TB_STATS_RUNNING, TB_STATS_PAUSED, TB_STATS_STOPPED };#define TB_NOTHING (1 << 0)#define TB_EXEC_STATS (1 << 1) +#define TB_JIT_STATS (1 << 2)extern int tcg_collect_tb_stats;extern uint32_t default_tbstats_flag;
tcg/tcg.c +23 -0
@@ -3126,6 +3126,11 @@ static void temp_sync(TCGContext *s, TCGTemp *ts, TCGRegSet allocated_regs,case TEMP_VAL_REG :tcg_out_st (s, ts->type, ts->reg, ts->mem_base->reg, ts->mem_offset); + +/* Count number of spills */ +if (tb_stats_enabled (s->current_tb,TB_JIT_STATS )) { +atomic_inc (&s->current_tb->tb_stats->code.spills); + }break ;case TEMP_VAL_MEM :
@@ -3997,6 +4002,8 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb)int i, num_insns;TCGOp *op; + s->current_tb = tb; +#ifdef CONFIG_PROFILER {int n =0 ;
@@ -4028,6 +4035,14 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) }#endif +if (tb_stats_enabled (tb,TB_JIT_STATS )) { +int n =0 ; + QTAILQ_FOREACH(op, &s->ops, link) { + n++; + } +atomic_add (&tb->tb_stats->code.num_tcg_ops, n); + } +#ifdef CONFIG_DEBUG_TCG /* Ensure all labels referenced have been emitted. */ {
@@ -4094,6 +4109,14 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) }#endif +if (tb_stats_enabled (tb,TB_JIT_STATS )) { +int n =0 ; + QTAILQ_FOREACH(op, &s->ops, link) { + n++; + } +atomic_add (&tb->tb_stats->code.num_tcg_ops_opt, n); + } +tcg_reg_alloc_start (s); s->code_buf = tb->tc.ptr;
tcg/tcg.h +2 -0
@@ -738,6 +738,8 @@ struct TCGContext {uint16_t gen_insn_end_off[TCG_MAX_INSNS ];target_ulong gen_insn_data[TCG_MAX_INSNS ][TARGET_INSN_START_WORDS ]; + +TranslationBlock *current_tb; };extern TCGContext tcg_init_ctx;
Signature · 1 line
2.22.0
PATCH v6 4/10 accel: replacing part of CONFIG_PROFILER with TBStats
In reply to vandersonmrWe add some of the statistics collected in the TCGProfiler into the TBStats, having the statistics not only for the whole emulation but for each TB. Then, we removed these stats from TCGProfiler and reconstruct the information for the "info jit" using the sum of all TBStats statistics.
The goal is to have one unique and better way of collecting emulation statistics. Moreover, checking dynamiclly if the profiling is enabled showed to have an insignificant impact on the performance:
https://wiki.qemu.org/Internships/ProjectIdeas/TCGCodeQuality#Overheads.
--- accel/tcg/tb-stats.c | 96 +++++++++++++++++++++++++++++++++++++++ accel/tcg/translate-all.c | 8 +--- include/exec/tb-stats.h | 11 +++++ tcg/tcg.c | 93 ++++--------------------------------- tcg/tcg.h | 10 ---- 5 files changed, 119 insertions(+), 99 deletions(-)
accel/tcg/tb-stats.c +96 -0
@@ -1,9 +1,105 @@#include "qemu/osdep.h" #include "disas/disas.h" +#include "exec/exec-all.h" +#include "tcg.h" + +#include "qemu/qemu-print.h" #include "exec/tb-stats.h" +struct jit_profile_info { +uint64_t translations; +uint64_t aborted; +uint64_t ops; +unsigned ops_max; +uint64_t del_ops; +uint64_t temps; +unsigned temps_max; +uint64_t host; +uint64_t guest; +uint64_t search_data; +}; + +/* accumulate the statistics from all TBs */ +static void collect_jit_profile_info (void *p,uint32_t hash,void *userp) +{ +struct jit_profile_info *jpi = userp; +TBStatistics *tbs = p; + + jpi->translations += tbs->translations.total; + jpi->ops += tbs->code.num_tcg_ops; +if (stat_per_translation (tbs, code.num_tcg_ops) > jpi->ops_max) { + jpi->ops_max =stat_per_translation (tbs, code.num_tcg_ops); + } + jpi->del_ops += tbs->code.deleted_ops; + jpi->temps += tbs->code.temps; +if (stat_per_translation (tbs, code.temps) > jpi->temps_max) { + jpi->temps_max =stat_per_translation (tbs, code.temps); + } + jpi->host += tbs->code.out_len; + jpi->guest += tbs->code.in_len; + jpi->search_data += tbs->code.search_out_len; +} + +/* dump JIT statisticis using TCGProfile and TBStats */ +void dump_jit_profile_info (TCGProfile *s) +{ +if (!tb_stats_collection_enabled ()) { +return ; + } + + struct jit_profile_info *jpi = g_new0(struct jit_profile_info, 1); + +qht_iter (&tb_ctx.tb_stats, collect_jit_profile_info, jpi); + +if (jpi->translations) { +qemu_printf ("translated TBs %" PRId64"\n" , jpi->translations); +qemu_printf ("avg ops/TB %0.1f max=%d\n" , + jpi->ops / (double ) jpi->translations, jpi->ops_max); +qemu_printf ("deleted ops/TB %0.2f\n" , + jpi->del_ops / (double ) jpi->translations); +qemu_printf ("avg temps/TB %0.2f max=%d\n" , + jpi->temps / (double ) jpi->translations, jpi->temps_max); +qemu_printf ("avg host code/TB %0.1f\n" , + jpi->host / (double ) jpi->translations); +qemu_printf ("avg search data/TB %0.1f\n" , + jpi->search_data / (double ) jpi->translations); + +if (s) { +int64_t tot = s->interm_time + s->code_time; +qemu_printf ("JIT cycles %" PRId64" (%0.3f s at 2.4 GHz)\n" , + tot, tot /2.4e9 ); +qemu_printf ("cycles/op %0.1f\n" , + jpi->ops ? (double )tot / jpi->ops :0 ); +qemu_printf ("cycles/in byte %0.1f\n" , + jpi->guest ? (double )tot / jpi->guest :0 ); +qemu_printf ("cycles/out byte %0.1f\n" , + jpi->host ? (double )tot / jpi->host :0 ); +qemu_printf ("cycles/search byte %0.1f\n" , + jpi->search_data ? (double )tot / jpi->search_data :0 ); +if (tot ==0 ) { + tot =1 ; + } +qemu_printf (" gen_interm time %0.1f%%\n" , + (double )s->interm_time / tot *100.0 ); +qemu_printf (" gen_code time %0.1f%%\n" , + (double )s->code_time / tot *100.0 ); +qemu_printf ("optim./code time %0.1f%%\n" , + (double )s->opt_time / (s->code_time ? s->code_time :1 ) + *100.0 ); +qemu_printf ("liveness/code time %0.1f%%\n" , + (double )s->la_time / (s->code_time ? s->code_time :1 ) *100.0 ); +qemu_printf ("cpu_restore count %" PRId64"\n" , + s->restore_count); +qemu_printf (" avg cycles %0.1f\n" , + s->restore_count ? (double )s->restore_time / s->restore_count :0 ); + } + } +g_free (jpi); +} + +void init_tb_stats_htable_if_not (void ) {if (tb_stats_collection_enabled () && !tb_ctx.tb_stats.map) {
accel/tcg/translate-all.c +2 -6
@@ -1774,8 +1774,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu, tb_overflow: #ifdef CONFIG_PROFILER -/* includes aborted translations because of exceptions */ -atomic_set (&prof->tb_count1, prof->tb_count1 +1 ); ti =profile_getclock ();#endif
@@ -1823,7 +1821,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu, }#ifdef CONFIG_PROFILER -atomic_set (&prof->tb_count, prof->tb_count +1 );atomic_set (&prof->interm_time, prof->interm_time +profile_getclock () - ti); ti =profile_getclock ();#endif
@@ -1870,13 +1867,12 @@ TranslationBlock *tb_gen_code(CPUState *cpu,#ifdef CONFIG_PROFILER atomic_set (&prof->code_time, prof->code_time +profile_getclock () - ti); -atomic_set (&prof->code_in_len, prof->code_in_len + tb->size); -atomic_set (&prof->code_out_len, prof->code_out_len + gen_code_size); -atomic_set (&prof->search_out_len, prof->search_out_len + search_size);#endif if (tb_stats_enabled (tb,TB_JIT_STATS )) { +atomic_add (&tb->tb_stats->code.in_len, tb->size);atomic_add (&tb->tb_stats->code.out_len, gen_code_size); +atomic_add (&tb->tb_stats->code.search_out_len, search_size); }#ifdef DEBUG_DISAS
include/exec/tb-stats.h +11 -0
@@ -9,6 +9,9 @@#define tb_stats_enabled (tb,JIT_STATS ) \ (tb && tb->tb_stats && (tb->tb_stats->stats_enabled & JIT_STATS)) +#define stat_per_translation (stat, name) \ + (stat->translations.total ? stat->name / stat->translations.total : 0) +typedef struct TBStatistics TBStatistics ;/*
@@ -39,7 +42,13 @@ struct TBStatistics {unsigned num_tcg_ops;unsigned num_tcg_ops_opt;unsigned spills; + +/* CONFIG_PROFILE */ +unsigned temps; +unsigned deleted_ops; +unsigned in_len;unsigned out_len; +unsigned search_out_len; } code;struct {
@@ -56,6 +65,8 @@ bool tb_stats_cmp(const void *ap, const void *bp);void init_tb_stats_htable_if_not (void ); +void dump_jit_profile_info (TCGProfile *s); +/* TBStatistic collection controls */ enum TBStatsStatus {TB_STATS_RUNNING ,TB_STATS_PAUSED ,TB_STATS_STOPPED };
tcg/tcg.c +10 -83
131 lines not on this page · raw message
tcg/tcg.h +0 -10
@@ -644,16 +644,6 @@ QEMU_BUILD_BUG_ON(NB_OPS > (1 << 8)); typedef struct TCGProfile { int64_t cpu_exec_time; - int64_t tb_count1; - int64_t tb_count; - int64_t op_count; /* total insn count */ - int op_count_max; /* max insn per TB */ - int temp_count_max; - int64_t temp_count; - int64_t del_op_count; - int64_t code_in_len; - int64_t code_out_len; - int64_t search_out_len; int64_t interm_time; int64_t code_time; int64_t la_time;
Signature · 1 line
2.22.0
PATCH v6 5/10 accel: adding TB_JIT_TIME and full replacing CONFIG_PROFILER
In reply to vandersonmrReplace all others CONFIG_PROFILER statistics and migrate it to TBStatistics system. However, TCGProfiler still exists and can be use to store global statistics and times. All TB related statistics goes to TBStatistics.
--- accel/tcg/tb-stats.c | 91 +++++++++++++++++++--------- accel/tcg/translate-all.c | 47 ++++++++------- configure | 3 - cpus.c | 14 ++--- include/exec/tb-stats.h | 19 +++++- include/qemu/timer.h | 5 +- monitor/misc.c | 28 ++------- tcg/tcg.c | 124 +++++++++++--------------------------- tcg/tcg.h | 10 +-- vl.c | 8 +-- 10 files changed, 156 insertions(+), 193 deletions(-)
accel/tcg/tb-stats.c +64 -27
@@ -8,6 +8,8 @@#include "exec/tb-stats.h" +uint64_t dev_time; +struct jit_profile_info {uint64_t translations;uint64_t aborted;
@@ -19,6 +21,13 @@ struct jit_profile_info {uint64_t host;uint64_t guest;uint64_t search_data; + +uint64_t interm_time; +uint64_t code_time; +uint64_t restore_count; +uint64_t restore_time; +uint64_t opt_time; +uint64_t la_time; };/* accumulate the statistics from all TBs */
@@ -40,6 +49,29 @@ static void collect_jit_profile_info(void *p, uint32_t hash, void *userp) jpi->host += tbs->code.out_len; jpi->guest += tbs->code.in_len; jpi->search_data += tbs->code.search_out_len; + + jpi->interm_time +=stat_per_translation (tbs, time.interm); + jpi->code_time +=stat_per_translation (tbs, time.code); + jpi->opt_time +=stat_per_translation (tbs, time.opt); + jpi->la_time +=stat_per_translation (tbs, time.la); + jpi->restore_time += tbs->time.restore; + jpi->restore_count += tbs->time.restore_count; +} + +void dump_jit_exec_time_info (uint64_t dev_time) +{ +static uint64_t last_cpu_exec_time; +uint64_t cpu_exec_time; +uint64_t delta; + + cpu_exec_time =tcg_cpu_exec_time (); + delta = cpu_exec_time - last_cpu_exec_time; + +qemu_printf ("async time %" PRId64" (%0.3f)\n" , + dev_time, dev_time / (double )NANOSECONDS_PER_SECOND ); +qemu_printf ("qemu time %" PRId64" (%0.3f)\n" , + delta, delta / (double )NANOSECONDS_PER_SECOND ); + last_cpu_exec_time = cpu_exec_time; }/* dump JIT statisticis using TCGProfile and TBStats */
@@ -66,34 +98,39 @@ void dump_jit_profile_info(TCGProfile *s)qemu_printf ("avg search data/TB %0.1f\n" , jpi->search_data / (double ) jpi->translations); +uint64_t tot = jpi->interm_time + jpi->code_time; + +qemu_printf ("JIT cycles %" PRId64" (%0.3fs at 2.4 GHz)\n" , + tot, tot /2.4e9 ); +qemu_printf (" cycles/op %0.1f\n" , + jpi->ops ? (double )tot / jpi->ops :0 ); +qemu_printf (" cycles/in byte %0.1f\n" , + jpi->guest ? (double )tot / jpi->guest :0 ); +qemu_printf (" cycles/out byte %0.1f\n" , + jpi->host ? (double )tot / jpi->host :0 ); +qemu_printf (" cycles/search byte %0.1f\n" , + jpi->search_data ? (double )tot / jpi->search_data :0 ); +if (tot ==0 ) { + tot =1 ; + } + +qemu_printf (" gen_interm time %0.1f%%\n" , + (double )jpi->interm_time / tot *100.0 ); +qemu_printf (" gen_code time %0.1f%%\n" , + (double )jpi->code_time / tot *100.0 ); + +qemu_printf (" optim./code time %0.1f%%\n" , + (double )jpi->opt_time / (jpi->code_time ? jpi->code_time :1 ) *100.0 ); +qemu_printf (" liveness/code time %0.1f%%\n" , + (double )jpi->la_time / (jpi->code_time ? jpi->code_time :1 ) *100.0 ); + +qemu_printf ("cpu_restore count %" PRId64"\n" , jpi->restore_count); +qemu_printf (" avg cycles %0.1f\n" , + jpi->restore_count ? (double )jpi->restore_time / jpi->restore_count :0 ); +if (s) { -int64_t tot = s->interm_time + s->code_time; -qemu_printf ("JIT cycles %" PRId64" (%0.3f s at 2.4 GHz)\n" , - tot, tot /2.4e9 ); -qemu_printf ("cycles/op %0.1f\n" , - jpi->ops ? (double )tot / jpi->ops :0 ); -qemu_printf ("cycles/in byte %0.1f\n" , - jpi->guest ? (double )tot / jpi->guest :0 ); -qemu_printf ("cycles/out byte %0.1f\n" , - jpi->host ? (double )tot / jpi->host :0 ); -qemu_printf ("cycles/search byte %0.1f\n" , - jpi->search_data ? (double )tot / jpi->search_data :0 ); -if (tot ==0 ) { - tot =1 ; - } -qemu_printf (" gen_interm time %0.1f%%\n" , - (double )s->interm_time / tot *100.0 ); -qemu_printf (" gen_code time %0.1f%%\n" , - (double )s->code_time / tot *100.0 ); -qemu_printf ("optim./code time %0.1f%%\n" , - (double )s->opt_time / (s->code_time ? s->code_time :1 ) - *100.0 ); -qemu_printf ("liveness/code time %0.1f%%\n" , - (double )s->la_time / (s->code_time ? s->code_time :1 ) *100.0 ); -qemu_printf ("cpu_restore count %" PRId64"\n" , - s->restore_count); -qemu_printf (" avg cycles %0.1f\n" , - s->restore_count ? (double )s->restore_time / s->restore_count :0 ); +qemu_printf ("cpu exec time %" PRId64" (%0.3fs)\n" , + s->cpu_exec_time, s->cpu_exec_time / (double )NANOSECONDS_PER_SECOND ); } }g_free (jpi);
accel/tcg/translate-all.c +24 -23
89 lines not on this page · raw message
configure +0 -3
@@ -6614,9 +6614,6 @@ fi if test "$static" = "yes" ; then echo "CONFIG_STATIC=y" >> $config_host_mak fi -if test "$profiler" = "yes" ; then - echo "CONFIG_PROFILER=y" >> $config_host_mak -fi if test "$slirp" != "no"; then echo "CONFIG_SLIRP=y" >> $config_host_mak echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak
cpus.c +5 -9
@@ -1423,21 +1423,17 @@ static void process_icount_data(CPUState *cpu)static int tcg_cpu_exec (CPUState *cpu) {int ret; -#ifdef CONFIG_PROFILER -int64_t ti; -#endif +uint64_t ti;assert (tcg_enabled ()); -#ifdef CONFIG_PROFILER ti =profile_getclock (); -#endif +cpu_exec_start (cpu); ret =cpu_exec (cpu);cpu_exec_end (cpu); -#ifdef CONFIG_PROFILER -atomic_set (&tcg_ctx->prof.cpu_exec_time, - tcg_ctx->prof.cpu_exec_time +profile_getclock () - ti); -#endif + +atomic_add (&tcg_ctx->prof.cpu_exec_time,profile_getclock () - ti); +return ret; }
include/exec/tb-stats.h +18 -1
@@ -57,22 +57,39 @@ struct TBStatistics {unsigned long spanning; } translations; +struct { +int64_t restore; +uint64_t restore_count; +int64_t interm; +int64_t code; +int64_t opt; +int64_t la; + } time; +/* current TB linked to this TBStatistics */ TranslationBlock *tb; };bool tb_stats_cmp (const void *ap,const void *bp); +void dump_jit_exec_time_info (uint64_t dev_time); +void init_tb_stats_htable_if_not (void );void dump_jit_profile_info (TCGProfile *s);/* TBStatistic collection controls */ -enum TBStatsStatus {TB_STATS_RUNNING ,TB_STATS_PAUSED ,TB_STATS_STOPPED }; +enum TBStatsStatus { +TB_STATS_DISABLED =0 , +TB_STATS_RUNNING , +TB_STATS_PAUSED , +TB_STATS_STOPPED +};#define TB_NOTHING (1 << 0)#define TB_EXEC_STATS (1 << 1)#define TB_JIT_STATS (1 << 2) +#define TB_JIT_STATS (1 << 3)extern int tcg_collect_tb_stats;extern uint32_t default_tbstats_flag;
include/qemu/timer.h +1 -4
@@ -1037,13 +1037,10 @@ static inline int64_t cpu_get_host_ticks(void) }#endif -#ifdef CONFIG_PROFILER static inline int64_t profile_getclock (void ) {return get_clock (); } -extern int64_t dev_time; -#endif - +extern uint64_t dev_time;#endif
monitor/misc.c +6 -22
@@ -472,6 +472,11 @@ static void hmp_info_jit(Monitor *mon, const QDict *qdict)static void hmp_info_opcount (Monitor *mon,const QDict *qdict) { +if (!tb_stats_collection_enabled ()) { +error_report ("TB information not being recorded." ); +return ; + } +dump_opcount_info (); }#endif
@@ -1082,32 +1087,11 @@ static void hmp_info_mtree(Monitor *mon, const QDict *qdict)mtree_info (flatview, dispatch_tree, owner); } -#ifdef CONFIG_PROFILER - -int64_t dev_time; -static void hmp_info_profile (Monitor *mon,const QDict *qdict) { -static int64_t last_cpu_exec_time; -int64_t cpu_exec_time; -int64_t delta; - - cpu_exec_time =tcg_cpu_exec_time (); - delta = cpu_exec_time - last_cpu_exec_time; - -monitor_printf (mon,"async time %" PRId64" (%0.3f)\n" , - dev_time, dev_time / (double )NANOSECONDS_PER_SECOND ); -monitor_printf (mon,"qemu time %" PRId64" (%0.3f)\n" , - delta, delta / (double )NANOSECONDS_PER_SECOND ); - last_cpu_exec_time = cpu_exec_time; +dump_jit_exec_time_info (dev_time); dev_time =0 ; } -#else -static void hmp_info_profile (Monitor *mon,const QDict *qdict) -{ -monitor_printf (mon,"Internal profiler not compiled\n" ); -} -#endif /* Capture support */ static QLIST_HEAD (capture_list_head, CaptureState) capture_head;
tcg/tcg.c +36 -88
198 lines not on this page · raw message
tcg/tcg.h +1 -9
@@ -644,12 +644,6 @@ QEMU_BUILD_BUG_ON(NB_OPS > (1 << 8));typedef struct TCGProfile {int64_t cpu_exec_time; -int64_t interm_time; -int64_t code_time; -int64_t la_time; -int64_t opt_time; -int64_t restore_count; -int64_t restore_time;int64_t table_op_count[NB_OPS ]; }TCGProfile ;
@@ -677,9 +671,7 @@ struct TCGContext {tcg_insn_unit *code_ptr; -#ifdef CONFIG_PROFILER TCGProfile prof; -#endif #ifdef CONFIG_DEBUG_TCG int temps_in_use;
@@ -1011,7 +1003,7 @@ int tcg_check_temp_count(void);#define tcg_check_temp_count () 0#endif -int64_t tcg_cpu_exec_time (void ); +uint64_t tcg_cpu_exec_time (void );void tcg_dump_info (void );void tcg_dump_op_count (void );
vl.c +1 -7
@@ -1781,17 +1781,11 @@ static bool main_loop_should_exit(void)static void main_loop (void ) { -#ifdef CONFIG_PROFILER -int64_t ti; -#endif +uint64_t ti;while (!main_loop_should_exit ()) { -#ifdef CONFIG_PROFILER ti =profile_getclock (); -#endif main_loop_wait (false); -#ifdef CONFIG_PROFILER dev_time +=profile_getclock () - ti; -#endif } }
Signature · 1 line
2.22.0
Re: [Qemu-devel] [PATCH v6 05/10] accel: adding TB_JIT_TIME and full replacing CONFIG_PROFILER
Quoted 321 lines · vandersonmr
Replace all others
CONFIG_PROFILERstatistics and migrate it to TBStatistics system. However, TCGProfiler still exists and can be use to store global statistics and times. All TB related statistics goes to TBStatistics.Signed-off-by Vanderson M. do Rosario <[email protected]>--- accel/tcg/tb-stats.c | 91 +++++++++++++++++++--------- accel/tcg/translate-all.c | 47 ++++++++------- configure | 3 - cpus.c | 14 ++--- include/exec/tb-stats.h | 19 +++++- include/qemu/timer.h | 5 +- monitor/misc.c | 28 ++------- tcg/tcg.c | 124 +++++++++++--------------------------- tcg/tcg.h | 10 +-- vl.c | 8 +-- 10 files changed, 156 insertions(+), 193 deletions(-)accel/tcg/tb-stats.c +64
-27@@ -8,6 +8,8 @@#include "exec/tb-stats.h" +uint64_t dev_time; +struct jit_profile_info {uint64_t translations;uint64_t aborted;@@ -19,6 +21,13 @@ struct jit_profile_info {uint64_t host;uint64_t guest;uint64_t search_data; + +uint64_t interm_time; +uint64_t code_time; +uint64_t restore_count; +uint64_t restore_time; +uint64_t opt_time; +uint64_t la_time; };/* accumulate the statistics from all TBs */ @@ -40,6 +49,29 @@ static void collect_jit_profile_info(void *p, uint32_t hash, void *userp) jpi->host += tbs->code.out_len; jpi->guest += tbs->code.in_len; jpi->search_data += tbs->code.search_out_len; + + jpi->interm_time +=stat_per_translation (tbs, time.interm); + jpi->code_time +=stat_per_translation (tbs, time.code); + jpi->opt_time +=stat_per_translation (tbs, time.opt); + jpi->la_time +=stat_per_translation (tbs, time.la); + jpi->restore_time += tbs->time.restore; + jpi->restore_count += tbs->time.restore_count; +} + +void dump_jit_exec_time_info (uint64_t dev_time) +{ +static uint64_t last_cpu_exec_time; +uint64_t cpu_exec_time; +uint64_t delta; + + cpu_exec_time =tcg_cpu_exec_time (); + delta = cpu_exec_time - last_cpu_exec_time; + +qemu_printf ("async time %" PRId64" (%0.3f)\n" , + dev_time, dev_time / (double )NANOSECONDS_PER_SECOND ); +qemu_printf ("qemu time %" PRId64" (%0.3f)\n" , + delta, delta / (double )NANOSECONDS_PER_SECOND ); + last_cpu_exec_time = cpu_exec_time; }/* dump JIT statisticis using TCGProfile and TBStats */ @@ -66,34 +98,39 @@ void dump_jit_profile_info(TCGProfile *s)qemu_printf ("avg search data/TB %0.1f\n" , jpi->search_data / (double ) jpi->translations); +uint64_t tot = jpi->interm_time + jpi->code_time; + +qemu_printf ("JIT cycles %" PRId64" (%0.3fs at 2.4 GHz)\n" , + tot, tot /2.4e9 ); +qemu_printf (" cycles/op %0.1f\n" , + jpi->ops ? (double )tot / jpi->ops :0 ); +qemu_printf (" cycles/in byte %0.1f\n" , + jpi->guest ? (double )tot / jpi->guest :0 ); +qemu_printf (" cycles/out byte %0.1f\n" , + jpi->host ? (double )tot / jpi->host :0 ); +qemu_printf (" cycles/search byte %0.1f\n" , + jpi->search_data ? (double )tot / jpi->search_data :0 ); +if (tot ==0 ) { + tot =1 ; + } + +qemu_printf (" gen_interm time %0.1f%%\n" , + (double )jpi->interm_time / tot *100.0 ); +qemu_printf (" gen_code time %0.1f%%\n" , + (double )jpi->code_time / tot *100.0 ); + +qemu_printf (" optim./code time %0.1f%%\n" , + (double )jpi->opt_time / (jpi->code_time ? jpi->code_time :1 ) *100.0 ); +qemu_printf (" liveness/code time %0.1f%%\n" , + (double )jpi->la_time / (jpi->code_time ? jpi->code_time :1 ) *100.0 ); + +qemu_printf ("cpu_restore count %" PRId64"\n" , jpi->restore_count); +qemu_printf (" avg cycles %0.1f\n" , + jpi->restore_count ? (double )jpi->restore_time / jpi->restore_count :0 ); +if (s) { -int64_t tot = s->interm_time + s->code_time; -qemu_printf ("JIT cycles %" PRId64" (%0.3f s at 2.4 GHz)\n" , - tot, tot /2.4e9 ); -qemu_printf ("cycles/op %0.1f\n" , - jpi->ops ? (double )tot / jpi->ops :0 ); -qemu_printf ("cycles/in byte %0.1f\n" , - jpi->guest ? (double )tot / jpi->guest :0 ); -qemu_printf ("cycles/out byte %0.1f\n" , - jpi->host ? (double )tot / jpi->host :0 ); -qemu_printf ("cycles/search byte %0.1f\n" , - jpi->search_data ? (double )tot / jpi->search_data :0 ); -if (tot ==0 ) { - tot =1 ; - } -qemu_printf (" gen_interm time %0.1f%%\n" , - (double )s->interm_time / tot *100.0 ); -qemu_printf (" gen_code time %0.1f%%\n" , - (double )s->code_time / tot *100.0 ); -qemu_printf ("optim./code time %0.1f%%\n" , - (double )s->opt_time / (s->code_time ? s->code_time :1 ) - *100.0 ); -qemu_printf ("liveness/code time %0.1f%%\n" , - (double )s->la_time / (s->code_time ? s->code_time :1 ) *100.0 ); -qemu_printf ("cpu_restore count %" PRId64"\n" , - s->restore_count); -qemu_printf (" avg cycles %0.1f\n" , - s->restore_count ? (double )s->restore_time / s->restore_count :0 ); +qemu_printf ("cpu exec time %" PRId64" (%0.3fs)\n" , + s->cpu_exec_time, s->cpu_exec_time / (double )NANOSECONDS_PER_SECOND ); } }g_free (jpi);accel/tcg/translate-all.c +24
-23@@ -337,10 +337,11 @@ static int cpu_restore_state_from_tb(CPUState *cpu, TranslationBlock *tb,CPUArchState *env = cpu->env_ptr;uint8_t *p = tb->tc.ptr + tb->tc.size;int i, j, num_insns = tb->icount; -#ifdef CONFIG_PROFILER -TCGProfile *prof = &tcg_ctx->prof; -int64_t ti =profile_getclock (); -#endif +uint64_t ti =0 ; + +if (tb_stats_enabled (tb,TB_JIT_TIME )) { + ti =profile_getclock (); + } searched_pc -=GETPC_ADJ ;@@ -370,11 +371,11 @@ static int cpu_restore_state_from_tb(CPUState *cpu, TranslationBlock *tb, }restore_state_to_opc (env, tb, data); -#ifdef CONFIG_PROFILER -atomic_set (&prof->restore_time, - prof->restore_time +profile_getclock () - ti); -atomic_set (&prof->restore_count, prof->restore_count +1 ); -#endif +if (tb_stats_enabled (tb,TB_JIT_TIME )) { +atomic_add (&tb->tb_stats->time.restore,profile_getclock () - ti); +atomic_inc (&tb->tb_stats->time.restore_count); + } +return 0 ; }@@ -1724,10 +1725,8 @@ TranslationBlock *tb_gen_code(CPUState *cpu,target_ulong virt_page2;tcg_insn_unit *gen_code_buf;int gen_code_size, search_size, max_insns; -#ifdef CONFIG_PROFILER -TCGProfile *prof = &tcg_ctx->prof; -int64_t ti; -#endif +uint64_t ti =0 ; +assert_memory_lock (); phys_pc =get_page_addr_code (env, pc);@@ -1773,9 +1772,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu, tcg_ctx->tb_cflags = cflags; tb_overflow: -#ifdef CONFIG_PROFILER - ti =profile_getclock (); -#endif /* * We want to fetch the stats structure before we start code @@ -1796,6 +1792,11 @@ TranslationBlock *tb_gen_code(CPUState *cpu, tb->tb_stats->stats_enabled |=TB_JIT_STATS ;atomic_inc (&tb->tb_stats->translations.total); } + +if (flag &TB_JIT_TIME ) { + tb->tb_stats->stats_enabled |=TB_JIT_TIME ; + ti =profile_getclock (); + } }else { tb->tb_stats =NULL ; }@@ -1820,10 +1821,10 @@ TranslationBlock *tb_gen_code(CPUState *cpu, tcg_ctx->tb_jmp_target_addr = tb->jmp_target_arg; } -#ifdef CONFIG_PROFILER -atomic_set (&prof->interm_time, prof->interm_time +profile_getclock () - ti); - ti =profile_getclock (); -#endif +if (tb_stats_enabled (tb,TB_JIT_TIME )) { +atomic_add (&tb->tb_stats->time.interm,profile_getclock () - ti); + ti =profile_getclock (); + } gen_code_size =tcg_gen_code (tcg_ctx, tb);if (unlikely (gen_code_size <0 )) {@@ -1865,9 +1866,9 @@ TranslationBlock *tb_gen_code(CPUState *cpu, } tb->tc.size = gen_code_size; -#ifdef CONFIG_PROFILER -atomic_set (&prof->code_time, prof->code_time +profile_getclock () - ti); -#endif +if (tb_stats_enabled (tb,TB_JIT_TIME )) { +atomic_add (&tb->tb_stats->time.code,profile_getclock () - ti); + }if (tb_stats_enabled (tb,TB_JIT_STATS )) {atomic_add (&tb->tb_stats->code.in_len, tb->size);configure +0
-3@@ -6614,9 +6614,6 @@ fi if test "$static" = "yes" ; then echo "CONFIG_STATIC=y" >> $config_host_mak fi -if test "$profiler" = "yes" ; then - echo "CONFIG_PROFILER=y" >> $config_host_mak -fi if test "$slirp" != "no"; then echo "CONFIG_SLIRP=y" >> $config_host_mak echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_makcpus.c +5
-9@@ -1423,21 +1423,17 @@ static void process_icount_data(CPUState *cpu)static int tcg_cpu_exec (CPUState *cpu) {int ret; -#ifdef CONFIG_PROFILER -int64_t ti; -#endif +uint64_t ti;assert (tcg_enabled ()); -#ifdef CONFIG_PROFILER ti =profile_getclock (); -#endif +cpu_exec_start (cpu); ret =cpu_exec (cpu);cpu_exec_end (cpu); -#ifdef CONFIG_PROFILER -atomic_set (&tcg_ctx->prof.cpu_exec_time, - tcg_ctx->prof.cpu_exec_time +profile_getclock () - ti); -#endif + +atomic_add (&tcg_ctx->prof.cpu_exec_time,profile_getclock () - ti); +return ret; }include/exec/tb-stats.h +13
-1@@ -57,22 +57,39 @@ struct TBStatistics {unsigned long spanning; } translations; +struct { +int64_t restore; +uint64_t restore_count; +int64_t interm; +int64_t code; +int64_t opt; +int64_t la; + } time; +/* current TB linked to this TBStatistics */ TranslationBlock *tb; };bool tb_stats_cmp (const void *ap,const void *bp); +void dump_jit_exec_time_info (uint64_t dev_time); +void init_tb_stats_htable_if_not (void );void dump_jit_profile_info (TCGProfile *s);/* TBStatistic collection controls */ -enum TBStatsStatus {TB_STATS_RUNNING ,TB_STATS_PAUSED ,TB_STATS_STOPPED }; +enum TBStatsStatus { +TB_STATS_DISABLED =0 ,
include/exec/tb-stats.h struct TBStatistics { · line 93
Quoted 10 lines
include/exec/tb-stats.h +5
-0+TB_STATS_RUNNING , +TB_STATS_PAUSED , + TB_STATS_STOPPED +};#define TB_NOTHING (1 << 0)#define TB_EXEC_STATS (1 << 1)#define TB_JIT_STATS (1 << 2) +#define TB_JIT_STATS (1 << 3)
This looks like a dupe, how could it compile? Should it in fact be TB_JIT_TIME?
Quoted 328 lines
include/exec/tb-stats.h +0
-0extern int tcg_collect_tb_stats;extern uint32_t default_tbstats_flag;include/qemu/timer.h +1
-4@@ -1037,13 +1037,10 @@ static inline int64_t cpu_get_host_ticks(void) }#endif -#ifdef CONFIG_PROFILER static inline int64_t profile_getclock (void ) {return get_clock (); } -extern int64_t dev_time; -#endif - +extern uint64_t dev_time;#endif monitor/misc.c +6
-22@@ -472,6 +472,11 @@ static void hmp_info_jit(Monitor *mon, const QDict *qdict)static void hmp_info_opcount (Monitor *mon,const QDict *qdict) { +if (!tb_stats_collection_enabled ()) { +error_report ("TB information not being recorded." ); +return ; + } +dump_opcount_info (); }#endif @@ -1082,32 +1087,11 @@ static void hmp_info_mtree(Monitor *mon, const QDict *qdict)mtree_info (flatview, dispatch_tree, owner); } -#ifdef CONFIG_PROFILER - -int64_t dev_time; -static void hmp_info_profile (Monitor *mon,const QDict *qdict) { -static int64_t last_cpu_exec_time; -int64_t cpu_exec_time; -int64_t delta; - - cpu_exec_time =tcg_cpu_exec_time (); - delta = cpu_exec_time - last_cpu_exec_time; - -monitor_printf (mon,"async time %" PRId64" (%0.3f)\n" , - dev_time, dev_time / (double )NANOSECONDS_PER_SECOND ); -monitor_printf (mon,"qemu time %" PRId64" (%0.3f)\n" , - delta, delta / (double )NANOSECONDS_PER_SECOND ); - last_cpu_exec_time = cpu_exec_time; +dump_jit_exec_time_info (dev_time); dev_time =0 ; } -#else -static void hmp_info_profile (Monitor *mon,const QDict *qdict) -{ -monitor_printf (mon,"Internal profiler not compiled\n" ); -} -#endif /* Capture support */ static QLIST_HEAD (capture_list_head, CaptureState) capture_head;tcg/tcg.c +36
-88@@ -3885,82 +3885,34 @@ static void tcg_reg_alloc_call(TCGContext *s, TCGOp *op) } } -#ifdef CONFIG_PROFILER -/* avoid copy/paste errors */ #define PROF_ADD (to, from, field) \ do { \ (to)->field += atomic_read(&((from)->field)); \ } while (0) -#define PROF_MAX (to, from, field) \ - do { \ - typeof((from)->field) val__ = atomic_read(&((from)->field)); \ - if (val__ > (to)->field) { \ - (to)->field = val__; \ - } \ - } while (0) - -/* Pass in a zero'ed @prof */ -static inline -void tcg_profile_snapshot (TCGProfile *prof,bool counters,bool table) +static void collect_tcg_profiler (TCGProfile *prof) { +int i;unsigned int n_ctxs =atomic_read (&n_tcg_ctxs); -unsigned int i;for (i =0 ; i < n_ctxs; i++) {TCGContext *s =atomic_read (&tcg_ctxs[i]);const TCGProfile *orig = &s->prof; -if (counters) { -PROF_ADD (prof, orig, cpu_exec_time); -PROF_ADD (prof, orig, interm_time); -PROF_ADD (prof, orig, code_time); -PROF_ADD (prof, orig, la_time); -PROF_ADD (prof, orig, opt_time); -PROF_ADD (prof, orig, restore_count); -PROF_ADD (prof, orig, restore_time); - } -if (table) { -int i; +PROF_ADD (prof, orig, cpu_exec_time); -for (i =0 ; i <NB_OPS ; i++) { -PROF_ADD (prof, orig, table_op_count[i]); - } +for (i =0 ; i <NB_OPS ; i++) { +PROF_ADD (prof, orig, table_op_count[i]); } } } -#undef PROF_ADD -#undef PROF_MAX - -static void tcg_profile_snapshot_counters (TCGProfile *prof) -{ -tcg_profile_snapshot (prof, true, false); -} - -static void tcg_profile_snapshot_table (TCGProfile *prof) -{ -tcg_profile_snapshot (prof, false, true); -} - -void tcg_dump_op_count (void ) -{ -TCGProfile prof = {}; -int i; - -tcg_profile_snapshot_table (&prof); -for (i =0 ; i <NB_OPS ; i++) { -qemu_printf ("%s %" PRId64"\n" , tcg_op_defs[i].name, - prof.table_op_count[i]); - } -} - -int64_t tcg_cpu_exec_time (void ) +uint64_t tcg_cpu_exec_time (void ) {unsigned int n_ctxs =atomic_read (&n_tcg_ctxs);unsigned int i; -int64_t ret =0 ; +uint64_t ret =0 ;for (i =0 ; i < n_ctxs; i++) {const TCGContext *s =atomic_read (&tcg_ctxs[i]);@@ -3970,25 +3922,9 @@ int64_t tcg_cpu_exec_time(void) }return ret; } -#else -void tcg_dump_op_count (void ) -{ -qemu_printf ("[TCG profiler not compiled]\n" ); -} - -int64_t tcg_cpu_exec_time (void ) -{ -error_report ("%s: TCG profiler not compiled" , __func__); -exit (EXIT_FAILURE ); -} -#endif -int tcg_gen_code (TCGContext *s,TranslationBlock *tb) { -#ifdef CONFIG_PROFILER -TCGProfile *prof = &s->prof; -#endif int i, num_insns;TCGOp *op;@@ -4041,18 +3977,18 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) }#endif -#ifdef CONFIG_PROFILER -atomic_set (&prof->opt_time, prof->opt_time -profile_getclock ()); -#endif +if (tb_stats_enabled (tb,TB_JIT_TIME )) { +atomic_add (&tb->tb_stats->time.opt, -profile_getclock ()); + }#ifdef USE_TCG_OPTIMIZATIONS tcg_optimize (s);#endif -#ifdef CONFIG_PROFILER -atomic_set (&prof->opt_time, prof->opt_time +profile_getclock ()); -atomic_set (&prof->la_time, prof->la_time -profile_getclock ()); -#endif +if (tb_stats_enabled (tb,TB_JIT_TIME )) { +atomic_add (&tb->tb_stats->time.opt,profile_getclock ()); +atomic_add (&tb->tb_stats->time.la, -profile_getclock ()); + }reachable_code_pass (s);liveness_pass_1 (s);@@ -4075,9 +4011,9 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) } } -#ifdef CONFIG_PROFILER -atomic_set (&prof->la_time, prof->la_time +profile_getclock ()); -#endif +if (tb_stats_enabled (tb,TB_JIT_TIME )) { +atomic_add (&tb->tb_stats->time.la,profile_getclock ()); + }#ifdef DEBUG_DISAS if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP_OPT)@@ -4110,14 +4046,17 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) s->pool_labels =NULL ;#endif +if (!tb_stats_collection_enabled ()) { + QTAILQ_FOREACH(op, &s->ops, link) { +TCGOpcode opc = op->opc; +atomic_add (&s->prof.table_op_count[opc],1 ); + } + } + num_insns =-1 ; QTAILQ_FOREACH(op, &s->ops, link) {TCGOpcode opc = op->opc; -#ifdef CONFIG_PROFILER -atomic_set (&prof->table_op_count[opc], prof->table_op_count[opc] +1 ); -#endif -switch (opc) {case INDEX_op_mov_i32:case INDEX_op_mov_i64:@@ -4210,14 +4149,23 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb)return tcg_current_code_size (s); } +void tcg_dump_op_count (void ) +{ +TCGProfile prof = {}; +int i; + +collect_tcg_profiler (&prof); +for (i =0 ; i <NB_OPS ; i++) { +qemu_printf ("%s %" PRId64"\n" , tcg_op_defs[i].name, prof.table_op_count[i]); + } +} +void tcg_dump_info (void ) {TCGProfile *s =NULL ; -#ifdef CONFIG_PROFILER TCGProfile prof = {}; -tcg_profile_snapshot_counters (&prof); s = &prof; -#endif +collect_tcg_profiler (s);dump_jit_profile_info (s); }tcg/tcg.h +1
-9@@ -644,12 +644,6 @@ QEMU_BUILD_BUG_ON(NB_OPS > (1 << 8));typedef struct TCGProfile {int64_t cpu_exec_time; -int64_t interm_time; -int64_t code_time; -int64_t la_time; -int64_t opt_time; -int64_t restore_count; -int64_t restore_time;int64_t table_op_count[NB_OPS ]; }TCGProfile ;@@ -677,9 +671,7 @@ struct TCGContext {tcg_insn_unit *code_ptr; -#ifdef CONFIG_PROFILER TCGProfile prof; -#endif #ifdef CONFIG_DEBUG_TCG int temps_in_use;@@ -1011,7 +1003,7 @@ int tcg_check_temp_count(void);#define tcg_check_temp_count () 0#endif -int64_t tcg_cpu_exec_time (void ); +uint64_t tcg_cpu_exec_time (void );void tcg_dump_info (void );void tcg_dump_op_count (void );vl.c +1
-3@@ -1781,17 +1781,11 @@ static bool main_loop_should_exit(void)static void main_loop (void ) { -#ifdef CONFIG_PROFILER -int64_t ti; -#endif +uint64_t ti;
vl.c static bool main_loop_should_exit(void) · line 1790
Quoted 10 lines
vl.c +0
-4while (!main_loop_should_exit ()) { -#ifdef CONFIG_PROFILER ti =profile_getclock (); -#endif main_loop_wait (false); -#ifdef CONFIG_PROFILER dev_time +=profile_getclock () - ti; -#endif } }
--
Alex Bennée
PATCH v6 6/10 log: adding -d tb_stats to control tbstats
In reply to vandersonmrAdding -d tb_stats to control TBStatistics collection:
-d tb_stats[[,level=(+all+jit+exec+time)][,dump_limit=<number>]]
"dump_limit" is used to limit the number of dumped TBStats in linux-user mode.
[all+jit+exec+time] control the profilling level used by the TBStats. Can be used as follow:
-d tb_stats
-d tb_stats,level=jit+time
-d tb_stats,dump_limit=15
...
--- accel/tcg/tb-stats.c | 1 + accel/tcg/translator.c | 1 + include/exec/gen-icount.h | 1 + include/exec/tb-stats.h | 15 --------------- include/qemu-common.h | 15 +++++++++++++++ include/qemu/log.h | 1 + tcg/tcg.c | 1 + util/log.c | 35 +++++++++++++++++++++++++++++++++++ 8 files changed, 55 insertions(+), 15 deletions(-)
accel/tcg/tb-stats.c +1 -0
@@ -3,6 +3,7 @@#include "disas/disas.h" #include "exec/exec-all.h" #include "tcg.h" +#include "qemu-common.h" #include "qemu/qemu-print.h"
accel/tcg/translator.c +1 -0
@@ -16,6 +16,7 @@#include "exec/gen-icount.h" #include "exec/log.h" #include "exec/translator.h" +#include "qemu-common.h" /* Pairs with tcg_clear_temp_count. To be called by #TranslatorOps.{translate_insn,tb_stop} if
include/exec/gen-icount.h +1 -0
@@ -2,6 +2,7 @@#define GEN_ICOUNT_H #include "qemu/timer.h" +#include "qemu-common.h" /* Helpers for instruction counting code generation. */
include/exec/tb-stats.h +0 -15
@@ -79,21 +79,6 @@ void init_tb_stats_htable_if_not(void);void dump_jit_profile_info (TCGProfile *s);/* TBStatistic collection controls */ -enum TBStatsStatus { -TB_STATS_DISABLED =0 , -TB_STATS_RUNNING , -TB_STATS_PAUSED , -TB_STATS_STOPPED -}; - -#define TB_NOTHING (1 << 0) -#define TB_EXEC_STATS (1 << 1) -#define TB_JIT_STATS (1 << 2) -#define TB_JIT_STATS (1 << 3) - -extern int tcg_collect_tb_stats; -extern uint32_t default_tbstats_flag; -void enable_collect_tb_stats (void );void disable_collect_tb_stats (void );void pause_collect_tb_stats (void );
include/qemu-common.h +15 -0
@@ -130,4 +130,19 @@ void page_size_init(void);* returned. */ bool dump_in_progress (void ); +enum TBStatsStatus { +TB_STATS_DISABLED =0 , +TB_STATS_RUNNING , +TB_STATS_PAUSED , +TB_STATS_STOPPED +}; + +#define TB_NOTHING (1 << 0) +#define TB_EXEC_STATS (1 << 1) +#define TB_JIT_STATS (1 << 2) +#define TB_JIT_TIME (1 << 3) + +extern int tcg_collect_tb_stats; +extern uint32_t default_tbstats_flag; +#endif
include/qemu/log.h +1 -0
@@ -45,6 +45,7 @@ static inline bool qemu_log_separate(void)/* LOG_TRACE (1 << 15) is defined in log-for-trace.h */ #define CPU_LOG_TB_OP_IND (1 << 16)#define CPU_LOG_TB_FPU (1 << 17) +#define CPU_LOG_TB_STATS (1 << 18)/* Lock output for a series of related logs. Since this is not needed * for a single qemu_log / qemu_log_mask / qemu_log_mask_and_addr, we
tcg/tcg.c +1 -0
@@ -35,6 +35,7 @@#include "qemu/host-utils.h" #include "qemu/qemu-print.h" #include "qemu/timer.h" +#include "qemu-common.h" /* Note: the long term plan is to reduce the dependencies on the QEMU CPU definitions. Currently they are used for qemu_ld/st
util/log.c +35 -0
@@ -19,17 +19,20 @@#include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/qemu-print.h" #include "qemu/range.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "qemu/cutils.h" #include "trace/control.h" +#include "qemu-common.h" static char *logfilename;FILE *qemu_logfile;int qemu_loglevel;static int log_append =0 ;static GArray *debug_regions; +int32_t max_num_hot_tbs_to_dump;int tcg_collect_tb_stats;uint32_t default_tbstats_flag;
@@ -276,6 +279,9 @@ const QEMULogItem qemu_log_items[] = { {CPU_LOG_TB_NOCHAIN ,"nochain" ,"do not chain compiled TBs so that \"exec\" and \"cpu\" show\n" "complete traces" }, + { CPU_LOG_TB_STATS, "tb_stats[[,level=(+all+jit+exec+time)][,dump_limit=<number>]]", +"enable collection of TBs statistics" + "(and dump until given a limit if in user mode).\n" }, { 0, NULL, NULL }, };
@@ -297,6 +303,35 @@ int qemu_str_to_log_mask(const char *str)trace_enable_events ((*tmp) +6 ); mask |=LOG_TRACE ;#endif + }else if (g_str_has_prefix (*tmp,"tb_stats" )) { + mask |=CPU_LOG_TB_STATS ; + default_tbstats_flag =TB_JIT_STATS |TB_EXEC_STATS |TB_JIT_TIME ; + tcg_collect_tb_stats =TB_STATS_RUNNING ; + }else if (tcg_collect_tb_stats ==TB_STATS_RUNNING && +g_str_has_prefix (*tmp,"dump_limit=" )) { + + max_num_hot_tbs_to_dump =atoi ((*tmp) +11 ); + }else if (tcg_collect_tb_stats ==TB_STATS_RUNNING && +g_str_has_prefix (*tmp,"level=" )) { + + default_tbstats_flag =0 ; +char **level_parts =g_strsplit (*tmp +6 ,"+" ,0 ); +char **level_tmp; +for (level_tmp = level_parts; level_tmp && *level_tmp; level_tmp++) { +if (g_str_equal (*level_tmp,"jit" )) { + default_tbstats_flag |=TB_JIT_STATS ; + }else if (g_str_equal (*level_tmp,"exec" )) { + default_tbstats_flag |=TB_EXEC_STATS ; + }else if (g_str_equal (*level_tmp,"time" )) { + default_tbstats_flag |=TB_JIT_TIME ; + }else if (g_str_equal (*level_tmp,"all" )) { + default_tbstats_flag |=TB_JIT_STATS |TB_EXEC_STATS |TB_JIT_TIME ; + }else { +fprintf (stderr,"no option level=%s, valid options are:" +"all, jit, exec or/and time\n" , *level_tmp); +exit (1 ); + } + } }else {for (item = qemu_log_items; item->mask !=0 ; item++) {if (g_str_equal (*tmp, item->name)) {
Signature · 1 line
2.22.0
Re: [Qemu-devel] [PATCH v6 06/10] log: adding -d tb_stats to control tbstats
Quoted 102 lines · vandersonmr
Adding -d
tb_statsto control TBStatistics collection:-d tb_stats[[,level=(+all+jit+exec+time)][,dump_limit=<number>]]
"
dump_limit" is used to limit the number of dumped TBStats in linux-user mode.[all+jit+exec+time] control the profilling level used by the TBStats. Can be used as follow:
(quoted diff) +0
-3-d tb_stats -d tb_stats,level=jit+time -d tb_stats,dump_limit=15Signed-off-by Vanderson M. do Rosario <[email protected]>--- accel/tcg/tb-stats.c | 1 + accel/tcg/translator.c | 1 + include/exec/gen-icount.h | 1 + include/exec/tb-stats.h | 15 --------------- include/qemu-common.h | 15 +++++++++++++++ include/qemu/log.h | 1 + tcg/tcg.c | 1 + util/log.c | 35 +++++++++++++++++++++++++++++++++++ 8 files changed, 55 insertions(+), 15 deletions(-)accel/tcg/tb-stats.c +1
-0@@ -3,6 +3,7 @@#include "disas/disas.h" #include "exec/exec-all.h" #include "tcg.h" +#include "qemu-common.h" #include "qemu/qemu-print.h" accel/tcg/translator.c +1
-0@@ -16,6 +16,7 @@#include "exec/gen-icount.h" #include "exec/log.h" #include "exec/translator.h" +#include "qemu-common.h" /* Pairs with tcg_clear_temp_count. To be called by #TranslatorOps.{translate_insn,tb_stop} if include/exec/gen-icount.h +1
-0@@ -2,6 +2,7 @@#define GEN_ICOUNT_H #include "qemu/timer.h" +#include "qemu-common.h" /* Helpers for instruction counting code generation. */ include/exec/tb-stats.h +0
-15@@ -79,21 +79,6 @@ void init_tb_stats_htable_if_not(void);void dump_jit_profile_info (TCGProfile *s);/* TBStatistic collection controls */ -enum TBStatsStatus { -TB_STATS_DISABLED =0 , -TB_STATS_RUNNING , -TB_STATS_PAUSED , -TB_STATS_STOPPED -}; - -#define TB_NOTHING (1 << 0) -#define TB_EXEC_STATS (1 << 1) -#define TB_JIT_STATS (1 << 2) -#define TB_JIT_STATS (1 << 3) - -extern int tcg_collect_tb_stats; -extern uint32_t default_tbstats_flag; -void enable_collect_tb_stats (void );void disable_collect_tb_stats (void );void pause_collect_tb_stats (void );include/qemu-common.h +5
-0@@ -130,4 +130,19 @@ void page_size_init(void);* returned. */ bool dump_in_progress (void ); +enum TBStatsStatus { +TB_STATS_DISABLED =0 , +TB_STATS_RUNNING , +TB_STATS_PAUSED , +TB_STATS_STOPPED
include/qemu-common.h void page_size_init(void); · line 147
Quoted 10 lines
include/qemu-common.h +10
-0+}; + +#define TB_NOTHING (1 << 0) +#define TB_EXEC_STATS (1 << 1) +#define TB_JIT_STATS (1 << 2) +#define TB_JIT_TIME (1 << 3) + +extern int tcg_collect_tb_stats; +extern uint32_t default_tbstats_flag; +
This seems like a regression, why move from tb-stats.h? We should certainly resist dumping more stuff in qemu-common.h.
Quoted 30 lines
include/qemu-common.h +0
-0#endif include/qemu/log.h +1
-0@@ -45,6 +45,7 @@ static inline bool qemu_log_separate(void)/* LOG_TRACE (1 << 15) is defined in log-for-trace.h */ #define CPU_LOG_TB_OP_IND (1 << 16)#define CPU_LOG_TB_FPU (1 << 17) +#define CPU_LOG_TB_STATS (1 << 18)/* Lock output for a series of related logs. Since this is not needed * for a single qemu_log / qemu_log_mask / qemu_log_mask_and_addr, we tcg/tcg.c +1
-0@@ -35,6 +35,7 @@#include "qemu/host-utils.h" #include "qemu/qemu-print.h" #include "qemu/timer.h" +#include "qemu-common.h" /* Note: the long term plan is to reduce the dependencies on the QEMU CPU definitions. Currently they are used for qemu_ld/st util/log.c +0
-0
util/log.c line 28
Quoted 10 lines
util/log.c +2
-0@@ -19,17 +19,20 @@#include "qemu/osdep.h" #include "qemu/log.h" +#include "qemu/qemu-print.h" #include "qemu/range.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "qemu/cutils.h" #include "trace/control.h" +#include "qemu-common.h"
So the root problem you are trying to get around is we can't pollute common code like logging with CPU definitions (which are required for ram_addr_t stuff).
The solution for this is to split the enums and "common code facing" API functions into another header (tb-stats-flags.h?) which doesn't need to pull in the target specific bits.
Quoted 43 lines
util/log.c +23
-0static char *logfilename;FILE *qemu_logfile;int qemu_loglevel;static int log_append =0 ;static GArray *debug_regions; +int32_t max_num_hot_tbs_to_dump;int tcg_collect_tb_stats;uint32_t default_tbstats_flag;@@ -276,6 +279,9 @@ const QEMULogItem qemu_log_items[] = { {CPU_LOG_TB_NOCHAIN ,"nochain" ,"do not chain compiled TBs so that \"exec\" and \"cpu\" show\n" "complete traces" }, + { CPU_LOG_TB_STATS, "tb_stats[[,level=(+all+jit+exec+time)][,dump_limit=<number>]]", +"enable collection of TBs statistics" + "(and dump until given a limit if in user mode).\n" }, { 0, NULL, NULL }, };@@ -297,6 +303,35 @@ int qemu_str_to_log_mask(const char *str)trace_enable_events ((*tmp) +6 ); mask |=LOG_TRACE ;#endif + }else if (g_str_has_prefix (*tmp,"tb_stats" )) { + mask |=CPU_LOG_TB_STATS ; + default_tbstats_flag =TB_JIT_STATS |TB_EXEC_STATS |TB_JIT_TIME ; + tcg_collect_tb_stats =TB_STATS_RUNNING ; + }else if (tcg_collect_tb_stats ==TB_STATS_RUNNING && +g_str_has_prefix (*tmp,"dump_limit=" )) { + + max_num_hot_tbs_to_dump =atoi ((*tmp) +11 ); + }else if (tcg_collect_tb_stats ==TB_STATS_RUNNING && +g_str_has_prefix (*tmp,"level=" )) { + + default_tbstats_flag =0 ; +char **level_parts =g_strsplit (*tmp +6 ,"+" ,0 ); +char **level_tmp; +for (level_tmp = level_parts; level_tmp && *level_tmp; level_tmp++) { +if (g_str_equal (*level_tmp,"jit" )) { + default_tbstats_flag |=TB_JIT_STATS ; + }else if (g_str_equal (*level_tmp,"exec" )) { + default_tbstats_flag |=TB_EXEC_STATS ;
util/log.c int qemu_str_to_log_mask(const char *str) · line 334
Quoted 10 lines
util/log.c +10
-0+ }else if (g_str_equal (*level_tmp,"time" )) { + default_tbstats_flag |=TB_JIT_TIME ; + }else if (g_str_equal (*level_tmp,"all" )) { + default_tbstats_flag |=TB_JIT_STATS |TB_EXEC_STATS |TB_JIT_TIME ; + }else { +fprintf (stderr,"no option level=%s, valid options are:" +"all, jit, exec or/and time\n" , *level_tmp); +exit (1 ); + } + }
I'm pretty sure the string vector needs freeing once your done (g_strfreev())
util/log.c int qemu_str_to_log_mask(const char *str) · line 337
Quoted 3 lines
util/log.c +0
-0}else {for (item = qemu_log_items; item->mask !=0 ; item++) {if (g_str_equal (*tmp, item->name)) {
--
Alex Bennée
PATCH v6 7/10 monitor: adding tb_stats hmp command
In reply to vandersonmrAdding tb_stats [start|pause|stop|filter] command to hmp. This allows controlling the collection of statistics. It is also possible to set the level of collection:
all, jit, or exec.
tb_stats filter allow to only collect statistics for the TB in the last_search list.
The goal of this command is to allow the dynamic exploration of the TCG behavior and quality. Therefore, for now, a corresponding QMP command is not worthwhile.
--- accel/tcg/tb-stats.c | 111 ++++++++++++++++++++++++++++++++++++++++ hmp-commands.hx | 17 ++++++ include/exec/tb-stats.h | 12 +++++ include/qemu-common.h | 1 + monitor/misc.c | 49 ++++++++++++++++++ vl.c | 6 +++ 6 files changed, 196 insertions(+)
accel/tcg/tb-stats.c +111 -0
@@ -9,6 +9,9 @@#include "exec/tb-stats.h" +/* only accessed in safe work */ +static GList *last_search; +uint64_t dev_time;struct jit_profile_info {
@@ -137,6 +140,96 @@ void dump_jit_profile_info(TCGProfile *s)g_free (jpi); } +static void free_tbstats (void *p,uint32_t hash,void *userp) +{ +g_free (p); +} + +static void clean_tbstats (void ) +{ +/* remove all tb_stats */ +qht_iter (&tb_ctx.tb_stats, free_tbstats,NULL ); +qht_destroy (&tb_ctx.tb_stats); +} + +void do_hmp_tbstats_safe (CPUState *cpu,run_on_cpu_data icmd) +{ +struct TbstatsCommand *cmdinfo = icmd.host_ptr; +int cmd = cmdinfo->cmd; +uint32_t level = cmdinfo->level; + +switch (cmd) { +case START : +if (tb_stats_collection_paused ()) { +set_tbstats_flags (level); + }else { +if (tb_stats_collection_enabled ()) { +qemu_printf ("TB information already being recorded" ); +return ; + } +qht_init (&tb_ctx.tb_stats, tb_stats_cmp,CODE_GEN_HTABLE_SIZE , +QHT_MODE_AUTO_RESIZE ); + } + +set_default_tbstats_flag (level); +enable_collect_tb_stats (); +tb_flush (cpu); +break ; +case PAUSE : +if (!tb_stats_collection_enabled ()) { +qemu_printf ("TB information not being recorded" ); +return ; + } + +/* Continue to create TBStatistic structures but stop collecting statistics */ +pause_collect_tb_stats (); +set_default_tbstats_flag (TB_NOTHING ); +set_tbstats_flags (TB_PAUSED ); +tb_flush (cpu); +break ; +case STOP : +if (!tb_stats_collection_enabled ()) { +qemu_printf ("TB information not being recorded" ); +return ; + } + +/* Dissalloc all TBStatistics structures and stop creating new ones */ +disable_collect_tb_stats (); +clean_tbstats (); +tb_flush (cpu); +break ; +case FILTER : +if (!tb_stats_collection_enabled ()) { +qemu_printf ("TB information not being recorded" ); +return ; + } +if (!last_search) { +qemu_printf ("no search on record! execute info tbs before filtering!" ); +return ; + } + +set_default_tbstats_flag (TB_NOTHING ); + +/* Set all tbstats as paused, then return only the ones from last_search */ +pause_collect_tb_stats (); +set_tbstats_flags (TB_PAUSED ); + +for (GList *iter = last_search; iter; iter =g_list_next (iter)) { +TBStatistics *tbs = iter->data; + tbs->stats_enabled = level; + } + +tb_flush (cpu); + +break ; +default :/* INVALID */ +g_assert_not_reached (); +break ; + } + +g_free (cmdinfo); +} +void init_tb_stats_htable_if_not (void ) {
@@ -172,6 +265,24 @@ bool tb_stats_collection_paused(void)return tcg_collect_tb_stats ==TB_STATS_PAUSED ; } +static void reset_tbstats_flag (void *p,uint32_t hash,void *userp) +{ +uint32_t flag = *((int *)userp); +TBStatistics *tbs = p; + tbs->stats_enabled = flag; +} + +void set_default_tbstats_flag (uint32_t flag) +{ + default_tbstats_flag = flag; +} + +void set_tbstats_flags (uint32_t flag) +{ +/* iterate over tbstats setting their flag as TB_NOTHING */ +qht_iter (&tb_ctx.tb_stats, reset_tbstats_flag, &flag); +} +uint32_t get_default_tbstats_flag (void ) {return default_tbstats_flag;
hmp-commands.hx +17 -0
@@ -1885,6 +1885,23 @@ STEXI @findex qemu-io Executes a qemu-io command on the given block device. +ETEXI +#if defined(CONFIG_TCG) + { + .name = "tb_stats", + .args_type = "command:s,level:s?", + .params = "command [stats_level]", + .help = "Control tb statistics collection:" + "tb_stats (start|pause|stop|filter) [all|jit_stats|exec_stats]", + .cmd = hmp_tbstats, + }, +#endif + +STEXI +@item tb_stats +@findex +Control recording tb statistics + ETEXI {
include/exec/tb-stats.h +12 -0
@@ -6,6 +6,9 @@#include "exec/tb-context.h" #include "tcg.h" +enum SortBy {SORT_BY_HOTNESS ,SORT_BY_HG /* Host/Guest */ ,SORT_BY_SPILLS }; +enum TbstatsCmd {START ,PAUSE ,STOP ,FILTER }; +#define tb_stats_enabled (tb,JIT_STATS ) \ (tb && tb->tb_stats && (tb->tb_stats->stats_enabled & JIT_STATS))
@@ -74,10 +77,18 @@ bool tb_stats_cmp(const void *ap, const void *bp);void dump_jit_exec_time_info (uint64_t dev_time); +void set_tbstats_flags (uint32_t flags);void init_tb_stats_htable_if_not (void );void dump_jit_profile_info (TCGProfile *s); +struct TbstatsCommand { +enum TbstatsCmd cmd; +uint32_t level; +}; + +void do_hmp_tbstats_safe (CPUState *cpu,run_on_cpu_data icmd); +/* TBStatistic collection controls */ void enable_collect_tb_stats (void );void disable_collect_tb_stats (void );
@@ -85,6 +96,7 @@ void pause_collect_tb_stats(void);bool tb_stats_collection_enabled (void );bool tb_stats_collection_paused (void ); +void set_default_tbstats_flag (uint32_t flag);uint32_t get_default_tbstats_flag (void );#endif
include/qemu-common.h +1 -0
@@ -141,6 +141,7 @@ enum TBStatsStatus {#define TB_EXEC_STATS (1 << 1)#define TB_JIT_STATS (1 << 2)#define TB_JIT_TIME (1 << 3) +#define TB_PAUSED (1 << 4)extern int tcg_collect_tb_stats;extern uint32_t default_tbstats_flag;
monitor/misc.c +49 -0
69 lines not on this page · raw message
vl.c +6 -0
@@ -1781,11 +1781,17 @@ static bool main_loop_should_exit(void)static void main_loop (void ) { +#ifdef CONFIG_TCG uint64_t ti; +#endif while (!main_loop_should_exit ()) { +#ifdef CONFIG_TCG ti =profile_getclock (); +#endif main_loop_wait (false); +#ifdef CONFIG_TCG dev_time +=profile_getclock () - ti; +#endif } }
Signature · 1 line
2.22.0
PATCH v6 8/10 Adding info [tb-list|tb|coverset] commands to HMP.
In reply to vandersonmrThese commands allow the exploration of TBs
generated by the TCG. Understand which one
hotter, with more guest/host instructions...
and examine their guest, host and IR code.
The goal of this command is to allow the dynamic exploration of TCG behavior and code quality. Therefore, for now, a corresponding QMP command is not worthwhile.
Example of output:
TB id:1 | phys:0x34d54 virt:0x0000000000034d54 flags:0x0000f0
| exec:4828932/0 guest inst cov:16.38% | trans:1 ints: g:3 op:82 op_opt:34 spills:3 | h/g (host bytes / guest insts): 90.666664 | time to gen at 2.4GHz => code:3150.83(ns) IR:712.08(ns) | targets: 0x0000000000034d5e (id:11), 0x0000000000034d0d (id:2)
TB id:2 | phys:0x34d0d virt:0x0000000000034d0d flags:0x0000f0
| exec:4825842/0 guest inst cov:21.82% | trans:1 ints: g:4 op:80 op_opt:38 spills:2 | h/g (host bytes / guest insts): 84.000000 | time to gen at 2.4GHz => code:3362.92(ns) IR:793.75(ns) | targets: 0x0000000000034d19 (id:12), 0x0000000000034d54 (id:1)
TB id:2 | phys:0x34d0d virt:0x0000000000034d0d flags:0x0000f0
| exec:6956495/0 guest inst cov:21.82% | trans:2 ints: g:2 op:40 op_opt:19 spills:1 | h/g (host bytes / guest insts): 84.000000 | time to gen at 2.4GHz => code:3130.83(ns) IR:722.50(ns) | targets: 0x0000000000034d19 (id:12), 0x0000000000034d54 (id:1)
----------------
IN:
0x00034d0d: 89 de movl %ebx, %esi 0x00034d0f: 26 8b 0e movl %es:(%esi), %ecx 0x00034d12: 26 f6 46 08 80 testb $0x80, %es:8(%esi) 0x00034d17: 75 3b jne 0x34d54
------------------------------
TB id:1 | phys:0x34d54 virt:0x0000000000034d54 flags:0x0000f0
| exec:5202686/0 guest inst cov:11.28% | trans:1 ints: g:3 op:82 op_opt:34 spills:3 | h/g (host bytes / guest insts): 90.666664 | time to gen at 2.4GHz => code:2793.75(ns) IR:614.58(ns) | targets: 0x0000000000034d5e (id:3), 0x0000000000034d0d (id:2)
TB id:2 | phys:0x34d0d virt:0x0000000000034d0d flags:0x0000f0
| exec:5199468/0 guest inst cov:15.03% | trans:1 ints: g:4 op:80 op_opt:38 spills:2 | h/g (host bytes / guest insts): 84.000000 | time to gen at 2.4GHz => code:2958.75(ns) IR:719.58(ns) | targets: 0x0000000000034d19 (id:4), 0x0000000000034d54 (id:1)
------------------------------
2 TBs to reach 25% of guest inst exec coverage
Total of guest insts exec: 138346727
------------------------------
--- accel/tcg/tb-stats.c | 421 ++++++++++++++++++++++++++++++++++- accel/tcg/translate-all.c | 2 +- disas.c | 31 ++- hmp-commands-info.hx | 24 ++ include/exec/tb-stats.h | 45 +++- include/qemu/log-for-trace.h | 4 + include/qemu/log.h | 2 + monitor/misc.c | 74 ++++++ util/log.c | 52 ++++- 9 files changed, 634 insertions(+), 21 deletions(-)
accel/tcg/tb-stats.c +420 -1
@@ -11,9 +11,35 @@/* only accessed in safe work */ static GList *last_search; - +int id =1 ;/* display_id increment counter */ uint64_t dev_time; +static TBStatistics *get_tbstats_by_id (int id) +{ +GList *iter; + +for (iter = last_search; iter; iter =g_list_next (iter)) { +TBStatistics *tbs = iter->data; +if (tbs && tbs->display_id == id) { +return tbs; +break ; + } + } +return NULL ; +} + +static TBStatistics *get_tbstats_by_addr (target_ulong pc) +{ +GList *iter; +for (iter = last_search; iter; iter =g_list_next (iter)) { +TBStatistics *tbs = iter->data; +if (tbs && tbs->pc == pc) { +return tbs; + } + } +return NULL ; +} +struct jit_profile_info {uint64_t translations;uint64_t aborted;
@@ -152,6 +178,7 @@ static void clean_tbstats(void)qht_destroy (&tb_ctx.tb_stats); } +void do_hmp_tbstats_safe (CPUState *cpu,run_on_cpu_data icmd) {struct TbstatsCommand *cmdinfo = icmd.host_ptr;
@@ -239,6 +266,398 @@ void init_tb_stats_htable_if_not(void) } } +static void collect_tb_stats (void *p,uint32_t hash,void *userp) +{ + last_search =g_list_prepend (last_search, p); +} + +static void dump_tb_targets (TBStatistics *tbs) +{ +if (tbs && tbs->tb) { +TBStatistics *valid_target_tbstats[2 ] = {NULL ,NULL }; + +/* +* Check and ensure that targets' tbstats have a valid display_id and +* are in last_search list +*/ +for (int jmp_id =0 ; jmp_id <2 ; jmp_id++) { +qemu_spin_lock (&tbs->tb->jmp_lock); +TranslationBlock *tb_dst = + (TranslationBlock *) (atomic_read (&tbs->tb->jmp_dest[jmp_id]) & ~1 ); +qemu_spin_unlock (&tbs->tb->jmp_lock); + +if (tb_dst) { +target_ulong pc = tb_dst ? tb_dst->pc :0 ; + +/* Check if tb_dst is on the last_search list */ +TBStatistics *tbstats_pc =get_tbstats_by_addr (pc); + +/* if not in the last_search list, then insert it */ +if (!tbstats_pc) { + last_search =g_list_append (last_search, tb_dst->tb_stats); + } + +/* if the tb_stats does not have a valid display_id, then set one. */ +if (tb_dst->tb_stats && tb_dst->tb_stats->display_id ==0 ) { + tb_dst->tb_stats->display_id = id++; + valid_target_tbstats[jmp_id] = tb_dst->tb_stats; + } + } + } + +if (valid_target_tbstats[0 ] && !valid_target_tbstats[1 ]) { +qemu_log ("\t| targets: 0x" TARGET_FMT_lx" (id:%d)\n" , + valid_target_tbstats[0 ]->pc, valid_target_tbstats[0 ]->display_id); + }else if (!valid_target_tbstats[0 ] && valid_target_tbstats[1 ]) { +qemu_log ("\t| targets: 0x" TARGET_FMT_lx" (id:%d)\n" , + valid_target_tbstats[1 ]->pc, valid_target_tbstats[1 ]->display_id); + }else if (valid_target_tbstats[0 ] && valid_target_tbstats[1 ]) { +qemu_log ("\t| targets: 0x" TARGET_FMT_lx" (id:%d), " +"0x" TARGET_FMT_lx" (id:%d)\n" , + valid_target_tbstats[0 ]->pc, valid_target_tbstats[0 ]->display_id, + valid_target_tbstats[1 ]->pc, valid_target_tbstats[1 ]->display_id); + }else { +qemu_log ("\t| targets: no direct target\n" ); + } + } +} + +static void dump_tb_header (TBStatistics *tbs) +{ +unsigned g =stat_per_translation (tbs, code.num_guest_inst); +unsigned ops =stat_per_translation (tbs, code.num_tcg_ops); +unsigned ops_opt =stat_per_translation (tbs, code.num_tcg_ops_opt); +unsigned spills =stat_per_translation (tbs, code.spills); +unsigned h =stat_per_translation (tbs, code.out_len); + +float guest_host_prop = g ? ((float ) h / g) :0 ; + +qemu_log ("TB id:%d | phys:0x" TB_PAGE_ADDR_FMT " virt:0x" TARGET_FMT_lx +" flags:%#08x\n" , tbs->display_id, tbs->phys_pc, tbs->pc, tbs->flags); + +if (tbs_stats_enabled (tbs,TB_EXEC_STATS )) { +qemu_log ("\t| exec:%lu/%lu guest inst cov:%.2f%%\n" , tbs->executions.normal, + tbs->executions.atomic, tbs->executions.coverage /100.0f ); + } + +if (tbs_stats_enabled (tbs,TB_JIT_STATS )) { +qemu_log ("\t| trans:%lu ints: g:%u op:%u op_opt:%u spills:%d" +"\n\t| h/g (host bytes / guest insts): %f\n" , + tbs->translations.total, g, ops, ops_opt, spills, guest_host_prop); + } + +if (tbs_stats_enabled (tbs,TB_JIT_TIME )) { +qemu_log ("\t| time to gen at 2.4GHz => code:%0.2lf(ns) IR:%0.2lf(ns)\n" , + tbs->time.code /2.4 , tbs->time.interm /2.4 ); + } + +dump_tb_targets (tbs); +qemu_log ("\n" ); +} + +static gint +inverse_sort_tbs (gconstpointer p1,gconstpointer p2,gpointer psort_by) +{ +const TBStatistics *tbs1 = (TBStatistics *) p1; +const TBStatistics *tbs2 = (TBStatistics *) p2; +int sort_by = *((int *) psort_by); +unsigned long c1 =0 ; +unsigned long c2 =0 ; + +if (likely (sort_by ==SORT_BY_SPILLS )) { + c1 =stat_per_translation (tbs1, code.spills); + c2 =stat_per_translation (tbs2, code.spills); + }else if (likely (sort_by ==SORT_BY_HOTNESS )) { + c1 =stat_per_translation (tbs1, executions.normal); + c2 =stat_per_translation (tbs2, executions.normal); + }else if (likely (sort_by ==SORT_BY_HG )) { +if (tbs1->code.num_guest_inst ==0 ) { +return -1 ; + } +if (tbs2->code.num_guest_inst ==0 ) { +return 1 ; + } + +float a = + (float )stat_per_translation (tbs1, code.out_len) / tbs1->code.num_guest_inst; +float b = + (float )stat_per_translation (tbs2, code.out_len) / tbs2->code.num_guest_inst; + c1 = a <= b ?0 :1 ; + c2 = a <= b ?1 :0 ; + } + +return c1 < c2 ?1 : c1 == c2 ?0 :-1 ; +} + +static void dump_last_search_headers (int count) +{ +if (!last_search) { +qemu_log ("No data collected yet\n" ); +return ; + } + +GList *l = last_search; +while (l !=NULL && count--) { +TBStatistics *tbs = (TBStatistics *) l->data; +GList *next = l->next; +dump_tb_header (tbs); + l = next; + } +} + +static uint64_t calculate_last_search_coverages (void ) +{ +uint64_t total_exec_count =0 ; +GList *i; + +/* Compute total execution count for all tbs */ +for (i = last_search; i; i = i->next) { +TBStatistics *tbs = (TBStatistics *) i->data; + total_exec_count += + (tbs->executions.atomic + tbs->executions.normal) * tbs->code.num_guest_inst; + } + +for (i = last_search; i; i = i->next) { +TBStatistics *tbs = (TBStatistics *) i->data; +uint64_t tb_total_execs = + (tbs->executions.atomic + tbs->executions.normal) * tbs->code.num_guest_inst; + tbs->executions.coverage = (10000 * tb_total_execs) / (total_exec_count +1 ); + } + +return total_exec_count; +} + +static void do_dump_coverset_info (int percentage) +{ +mmap_lock (); +uint16_t total_coverage =0 ; +unsigned coverset_size =0 ; + percentage *=100 ; + id =1 ; +GList *i; + +g_list_free (last_search); + last_search =NULL ; + +qht_iter (&tb_ctx.tb_stats, collect_tb_stats,NULL ); + +int sort_by =SORT_BY_HOTNESS ; + last_search =g_list_sort_with_data (last_search, inverse_sort_tbs, &sort_by); + +if (!last_search) { +qemu_log ("No data collected yet\n" ); +return ; + } + +uint64_t total_exec_count =calculate_last_search_coverages (); + +/* Iterate and tbs display_id until reach the coverage percentage count */ +for (i = last_search; i && total_coverage < percentage; i = i->next) { +TBStatistics *tbs = (TBStatistics *) i->data; + tbs->display_id = id++; + coverset_size++; + total_coverage += tbs->executions.coverage; + } + +/* free the unused bits */ +if (i) { +if (i->next) { + i->next->prev =NULL ; + } +g_list_free (i->next); + i->next =NULL ; + } + +dump_last_search_headers (coverset_size); +mmap_unlock (); + +qemu_log ("------------------------------\n" ); +qemu_log ("%u TBs to reach %d%% of guest inst exec coverage\n" , + coverset_size, percentage /100 ); +qemu_log ("Total of guest insts exec: %lu" , total_exec_count); +qemu_log ("\n------------------------------\n" ); +} + +static void do_dump_tbs_info (int total,int sort_by) +{ + id =1 ; +GList *i; +int count = total; + +g_list_free (last_search); + last_search =NULL ; + +qht_iter (&tb_ctx.tb_stats, collect_tb_stats,NULL ); + + last_search =g_list_sort_with_data (last_search, inverse_sort_tbs, &sort_by); + +if (!last_search) { +qemu_printf ("No data collected yet!\n" ); +return ; + } + +calculate_last_search_coverages (); + +for (i = last_search; i && count--; i = i->next) { +TBStatistics *tbs = (TBStatistics *) i->data; + tbs->display_id = id++; + } + +/* free the unused bits */ +if (i) { +if (i->next) { + i->next->prev =NULL ; + } +g_list_free (i->next); + i->next =NULL ; + } + +dump_last_search_headers (total); +} + +static void +do_dump_coverset_info_safe (CPUState *cpu,run_on_cpu_data percentage) +{ +qemu_log_to_monitor (true); +do_dump_coverset_info (percentage.host_int); +qemu_log_to_monitor (false); +} + +struct tbs_dump_info { +int count; +int sort_by; +}; + +static void do_dump_tbs_info_safe (CPUState *cpu,run_on_cpu_data tbdi) +{ +struct tbs_dump_info *info = tbdi.host_ptr; +qemu_log_to_monitor (true); +do_dump_tbs_info (info->count, info->sort_by); +qemu_log_to_monitor (false); +g_free (info); +} + +/* +* When we dump_tbs_info on a live system via the HMP we want to +* ensure the system is quiessent before we start outputting stuff. +* Otherwise we could pollute the output with other logging output. +*/ +void dump_coverset_info (int percentage,bool use_monitor) +{ +if (use_monitor) { +async_safe_run_on_cpu (first_cpu, do_dump_coverset_info_safe, +RUN_ON_CPU_HOST_INT (percentage)); + }else { +do_dump_coverset_info (percentage); + } +} + +void dump_tbs_info (int count,int sort_by,bool use_monitor) +{ +if (use_monitor) { + struct tbs_dump_info *tbdi = g_new(struct tbs_dump_info, 1); + tbdi->count = count; + tbdi->sort_by = sort_by; +async_safe_run_on_cpu (first_cpu, do_dump_tbs_info_safe, +RUN_ON_CPU_HOST_PTR (tbdi)); + }else { +do_dump_tbs_info (count, sort_by); + } +} + +static GString *get_code_string (TBStatistics *tbs,int log_flags) +{ +int old_log_flags = qemu_loglevel; + +CPUState *cpu = first_cpu; +uint32_t cflags =curr_cflags () |CF_NOCACHE ; +TranslationBlock *tb =NULL ; + +GString *code_s =g_string_new (NULL ); +qemu_log_to_string (true, code_s); + +qemu_set_log (log_flags); + +if (sigsetjmp (cpu->jmp_env,0 ) ==0 ) { +mmap_lock (); + tb =tb_gen_code (cpu, tbs->pc, tbs->cs_base, tbs->flags, cflags); +tb_phys_invalidate (tb,-1 ); +mmap_unlock (); + }else { +/* +* The mmap_lock is dropped by tb_gen_code if it runs out of +* memory. +*/ +fprintf (stderr,"%s: dbg failed!\n" , __func__); +qemu_log ("\ncould not gen code for this TB\n" ); +assert_no_pages_locked (); + } + +qemu_set_log (old_log_flags); +qemu_log_to_string (false,NULL ); + +if (tb) { +tcg_tb_remove (tb); + } + +return code_s; +} + +static void do_tb_dump_with_statistics (TBStatistics *tbs,int log_flags) +{ +qemu_log ("\n------------------------------\n\n" ); +dump_tb_header (tbs); + +GString *code_s =get_code_string (tbs, log_flags); +qemu_log ("%s" , code_s->str); +g_string_free (code_s, true); +qemu_log ("------------------------------\n" ); +} + +struct tb_dump_info { +int id; +int log_flags; +bool use_monitor; +}; + +static void do_dump_tb_info_safe (CPUState *cpu,run_on_cpu_data info) +{ +struct tb_dump_info *tbdi = (struct tb_dump_info *) info.host_ptr; + +if (!last_search) { +qemu_log ("no search on record\n" ); +return ; + } + +qemu_log_to_monitor (tbdi->use_monitor); + +TBStatistics *tbs =get_tbstats_by_id (tbdi->id); +if (tbs) { +do_tb_dump_with_statistics (tbs, tbdi->log_flags); + }else { +qemu_log ("no TB statitics found with id %d\n" , tbdi->id); + } + +qemu_log_to_monitor (false); + +g_free (tbdi); +} + +void dump_tb_info (int id,int log_mask,bool use_monitor) +{ + struct tb_dump_info *tbdi = g_new(struct tb_dump_info, 1); + + tbdi->id = id; + tbdi->log_flags = log_mask; + tbdi->use_monitor = use_monitor; + +async_safe_run_on_cpu (first_cpu, do_dump_tb_info_safe, +RUN_ON_CPU_HOST_PTR (tbdi)); + +/* tbdi free'd by do_dump_tb_info_safe */ +} + +void enable_collect_tb_stats (void ) {init_tb_stats_htable_if_not ();
accel/tcg/translate-all.c +1 -1
@@ -1778,7 +1778,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu,* generation so we can count interesting things about this * generation. */ -if (tb_stats_collection_enabled ()) { +if (tb_stats_collection_enabled () && !(tb->cflags &CF_NOCACHE )) { tb->tb_stats =tb_get_stats (phys_pc, pc, cs_base, flags, tb);uint32_t flag =get_default_tbstats_flag ();
disas.c +25 -6
@@ -8,6 +8,8 @@#include "disas/disas.h" #include "disas/capstone.h" +#include "qemu/log-for-trace.h" + typedef struct CPUDebug { struct disassemble_info info; CPUState *cpu;
@@ -420,6 +422,22 @@ static bool cap_disas_monitor(disassemble_info *info, uint64_t pc, int count)# define cap_disas_monitor (i, p, c) false#endif /* CONFIG_CAPSTONE */ +static int fprintf_log (struct _IO_FILE *a,const char *b, ...) +{ +va_list ap; +va_start (ap, b); + +if (!to_string) { +vfprintf (a, b, ap); + }else { +qemu_vlog (b, ap); + } + +va_end (ap); + +return 1 ; +} +/* Disassemble this for me please... (debugging). */ void target_disas (FILE *out,CPUState *cpu,target_ulong code,target_ulong size)
@@ -429,7 +447,7 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong code,int count;CPUDebug s; -INIT_DISASSEMBLE_INFO (s.info, out, fprintf); +INIT_DISASSEMBLE_INFO (s.info, out, fprintf_log); s.cpu = cpu; s.info.read_memory_func = target_read_memory;
@@ -460,11 +478,12 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong code, }for (pc = code; size >0 ; pc += count, size -= count) { -fprintf (out,"0x" TARGET_FMT_lx": " , pc); - count = s.info.print_insn (pc, &s.info); -fprintf (out,"\n" ); -if (count <0 ) -break ; +fprintf_log (out,"0x" TARGET_FMT_lx": " , pc); + count = s.info.print_insn (pc, &s.info); +fprintf_log (out,"\n" ); +if (count <0 ) { +break ; + }if (size < count) {fprintf (out, "Disassembler disagrees with translator over instruction "
hmp-commands-info.hx +24 -0
@@ -289,6 +289,30 @@ ETEXI .help = "show dynamic compiler info", .cmd = hmp_info_jit, }, + { + .name = "tb-list", + .args_type = "number:i?,sortedby:s?", + .params = "[number sortedby]", + .help = "show a [number] translated blocks sorted by [sortedby]" + "sortedby opts: hotness hg spills", + .cmd = hmp_info_tblist, + }, + { + .name = "tb", + .args_type = "id:i,flags:s?", + .params = "id [flag1,flag2,...]", + .help = "show information about one translated block by id." + "dump flags can be used to set dump code level: out_asm in_asm op", + .cmd = hmp_info_tb, + }, + { + .name = "coverset", + .args_type = "coverage:i?", + .params = "[coverage]", + .help = "show hottest translated blocks neccesary to cover" + "[coverage]% of the execution count", + .cmd = hmp_info_coverset, + }, #endif STEXI
include/exec/tb-stats.h +43 -2
76 lines not on this page · raw message
include/qemu/log-for-trace.h +4 -0
@@ -20,6 +20,9 @@/* Private global variable, don't use */ extern int qemu_loglevel; +extern bool to_string; + +extern int32_t max_num_hot_tbs_to_dump;#define LOG_TRACE (1 << 15)
@@ -31,5 +34,6 @@ static inline bool qemu_loglevel_mask(int mask)/* main logging function */ int GCC_FMT_ATTR(1, 2) qemu_log(const char *fmt, ...); +int qemu_vlog(const char *fmt, va_list va);#endif
include/qemu/log.h +2 -0
@@ -114,6 +114,8 @@ typedef struct QEMULogItem {extern const QEMULogItem qemu_log_items[];void qemu_set_log (int log_flags); +void qemu_log_to_monitor (bool enable); +void qemu_log_to_string (bool enable,GString *s);void qemu_log_needs_buffers (void );void qemu_set_log_filename (const char *filename,Error **errp);void qemu_set_dfilter_ranges (const char *ranges,Error **errp);
monitor/misc.c +74 -0
80 lines not on this page · raw message
util/log.c +41 -11
69 lines not on this page · raw message
Signature · 1 line
2.22.0
Re: [Qemu-devel] [PATCH v6 08/10] Adding info [tb-list|tb|coverset] commands to HMP.
Quoted 55 lines · * vandersonmr ([email protected]) wrote:
These commands allow the exploration of TBs
generated by the TCG. Understand which one
hotter, with more guest/host instructions...
and examine their guest, host and IR code.The goal of this command is to allow the dynamic exploration of TCG behavior and code quality. Therefore, for now, a corresponding QMP command is not worthwhile.
Example of output:
TB id:1 | phys:0x34d54 virt:0x0000000000034d54 flags:0x0000f0
| exec:4828932/0 guest inst cov:16.38% | trans:1 ints: g:3 op:82 op_opt:34 spills:3 | h/g (host bytes / guest insts): 90.666664 | time to gen at 2.4GHz => code:3150.83(ns) IR:712.08(ns) | targets: 0x0000000000034d5e (id:11), 0x0000000000034d0d (id:2)TB id:2 | phys:0x34d0d virt:0x0000000000034d0d flags:0x0000f0
| exec:4825842/0 guest inst cov:21.82% | trans:1 ints: g:4 op:80 op_opt:38 spills:2 | h/g (host bytes / guest insts): 84.000000 | time to gen at 2.4GHz => code:3362.92(ns) IR:793.75(ns) | targets: 0x0000000000034d19 (id:12), 0x0000000000034d54 (id:1)TB id:2 | phys:0x34d0d virt:0x0000000000034d0d flags:0x0000f0
| exec:6956495/0 guest inst cov:21.82% | trans:2 ints: g:2 op:40 op_opt:19 spills:1 | h/g (host bytes / guest insts): 84.000000 | time to gen at 2.4GHz => code:3130.83(ns) IR:722.50(ns) | targets: 0x0000000000034d19 (id:12), 0x0000000000034d54 (id:1)----------------
IN:0x00034d0d: 89 de movl %ebx, %esi 0x00034d0f: 26 8b 0e movl %es:(%esi), %ecx 0x00034d12: 26 f6 46 08 80 testb $0x80, %es:8(%esi) 0x00034d17: 75 3b jne 0x34d54------------------------------
TB id:1 | phys:0x34d54 virt:0x0000000000034d54 flags:0x0000f0
| exec:5202686/0 guest inst cov:11.28% | trans:1 ints: g:3 op:82 op_opt:34 spills:3 | h/g (host bytes / guest insts): 90.666664 | time to gen at 2.4GHz => code:2793.75(ns) IR:614.58(ns) | targets: 0x0000000000034d5e (id:3), 0x0000000000034d0d (id:2)TB id:2 | phys:0x34d0d virt:0x0000000000034d0d flags:0x0000f0
| exec:5199468/0 guest inst cov:15.03% | trans:1 ints: g:4 op:80 op_opt:38 spills:2 | h/g (host bytes / guest insts): 84.000000 | time to gen at 2.4GHz => code:2958.75(ns) IR:719.58(ns) | targets: 0x0000000000034d19 (id:4), 0x0000000000034d54 (id:1)
Quoted 7 lines
------------------------------
2 TBs to reach 25% of guest inst exec coverage
Total of guest insts exec: 138346727------------------------------
Signed-off-by Vanderson M. do Rosario <[email protected]>
The HMP command defs look OK
Quoted 852 lines
--- accel/tcg/tb-stats.c | 421 ++++++++++++++++++++++++++++++++++- accel/tcg/translate-all.c | 2 +- disas.c | 31 ++- hmp-commands-info.hx | 24 ++ include/exec/tb-stats.h | 45 +++- include/qemu/log-for-trace.h | 4 + include/qemu/log.h | 2 + monitor/misc.c | 74 ++++++ util/log.c | 52 ++++- 9 files changed, 634 insertions(+), 21 deletions(-)accel/tcg/tb-stats.c +420
-1@@ -11,9 +11,35 @@/* only accessed in safe work */ static GList *last_search; - +int id =1 ;/* display_id increment counter */ uint64_t dev_time; +static TBStatistics *get_tbstats_by_id (int id) +{ +GList *iter; + +for (iter = last_search; iter; iter =g_list_next (iter)) { +TBStatistics *tbs = iter->data; +if (tbs && tbs->display_id == id) { +return tbs; +break ; + } + } +return NULL ; +} + +static TBStatistics *get_tbstats_by_addr (target_ulong pc) +{ +GList *iter; +for (iter = last_search; iter; iter =g_list_next (iter)) { +TBStatistics *tbs = iter->data; +if (tbs && tbs->pc == pc) { +return tbs; + } + } +return NULL ; +} +struct jit_profile_info {uint64_t translations;uint64_t aborted;@@ -152,6 +178,7 @@ static void clean_tbstats(void)qht_destroy (&tb_ctx.tb_stats); } +void do_hmp_tbstats_safe (CPUState *cpu,run_on_cpu_data icmd) {struct TbstatsCommand *cmdinfo = icmd.host_ptr;@@ -239,6 +266,398 @@ void init_tb_stats_htable_if_not(void) } } +static void collect_tb_stats (void *p,uint32_t hash,void *userp) +{ + last_search =g_list_prepend (last_search, p); +} + +static void dump_tb_targets (TBStatistics *tbs) +{ +if (tbs && tbs->tb) { +TBStatistics *valid_target_tbstats[2 ] = {NULL ,NULL }; + +/* +* Check and ensure that targets' tbstats have a valid display_id and +* are in last_search list +*/ +for (int jmp_id =0 ; jmp_id <2 ; jmp_id++) { +qemu_spin_lock (&tbs->tb->jmp_lock); +TranslationBlock *tb_dst = + (TranslationBlock *) (atomic_read (&tbs->tb->jmp_dest[jmp_id]) & ~1 ); +qemu_spin_unlock (&tbs->tb->jmp_lock); + +if (tb_dst) { +target_ulong pc = tb_dst ? tb_dst->pc :0 ; + +/* Check if tb_dst is on the last_search list */ +TBStatistics *tbstats_pc =get_tbstats_by_addr (pc); + +/* if not in the last_search list, then insert it */ +if (!tbstats_pc) { + last_search =g_list_append (last_search, tb_dst->tb_stats); + } + +/* if the tb_stats does not have a valid display_id, then set one. */ +if (tb_dst->tb_stats && tb_dst->tb_stats->display_id ==0 ) { + tb_dst->tb_stats->display_id = id++; + valid_target_tbstats[jmp_id] = tb_dst->tb_stats; + } + } + } + +if (valid_target_tbstats[0 ] && !valid_target_tbstats[1 ]) { +qemu_log ("\t| targets: 0x" TARGET_FMT_lx" (id:%d)\n" , + valid_target_tbstats[0 ]->pc, valid_target_tbstats[0 ]->display_id); + }else if (!valid_target_tbstats[0 ] && valid_target_tbstats[1 ]) { +qemu_log ("\t| targets: 0x" TARGET_FMT_lx" (id:%d)\n" , + valid_target_tbstats[1 ]->pc, valid_target_tbstats[1 ]->display_id); + }else if (valid_target_tbstats[0 ] && valid_target_tbstats[1 ]) { +qemu_log ("\t| targets: 0x" TARGET_FMT_lx" (id:%d), " +"0x" TARGET_FMT_lx" (id:%d)\n" , + valid_target_tbstats[0 ]->pc, valid_target_tbstats[0 ]->display_id, + valid_target_tbstats[1 ]->pc, valid_target_tbstats[1 ]->display_id); + }else { +qemu_log ("\t| targets: no direct target\n" ); + } + } +} + +static void dump_tb_header (TBStatistics *tbs) +{ +unsigned g =stat_per_translation (tbs, code.num_guest_inst); +unsigned ops =stat_per_translation (tbs, code.num_tcg_ops); +unsigned ops_opt =stat_per_translation (tbs, code.num_tcg_ops_opt); +unsigned spills =stat_per_translation (tbs, code.spills); +unsigned h =stat_per_translation (tbs, code.out_len); + +float guest_host_prop = g ? ((float ) h / g) :0 ; + +qemu_log ("TB id:%d | phys:0x" TB_PAGE_ADDR_FMT " virt:0x" TARGET_FMT_lx +" flags:%#08x\n" , tbs->display_id, tbs->phys_pc, tbs->pc, tbs->flags); + +if (tbs_stats_enabled (tbs,TB_EXEC_STATS )) { +qemu_log ("\t| exec:%lu/%lu guest inst cov:%.2f%%\n" , tbs->executions.normal, + tbs->executions.atomic, tbs->executions.coverage /100.0f ); + } + +if (tbs_stats_enabled (tbs,TB_JIT_STATS )) { +qemu_log ("\t| trans:%lu ints: g:%u op:%u op_opt:%u spills:%d" +"\n\t| h/g (host bytes / guest insts): %f\n" , + tbs->translations.total, g, ops, ops_opt, spills, guest_host_prop); + } + +if (tbs_stats_enabled (tbs,TB_JIT_TIME )) { +qemu_log ("\t| time to gen at 2.4GHz => code:%0.2lf(ns) IR:%0.2lf(ns)\n" , + tbs->time.code /2.4 , tbs->time.interm /2.4 ); + } + +dump_tb_targets (tbs); +qemu_log ("\n" ); +} + +static gint +inverse_sort_tbs (gconstpointer p1,gconstpointer p2,gpointer psort_by) +{ +const TBStatistics *tbs1 = (TBStatistics *) p1; +const TBStatistics *tbs2 = (TBStatistics *) p2; +int sort_by = *((int *) psort_by); +unsigned long c1 =0 ; +unsigned long c2 =0 ; + +if (likely (sort_by ==SORT_BY_SPILLS )) { + c1 =stat_per_translation (tbs1, code.spills); + c2 =stat_per_translation (tbs2, code.spills); + }else if (likely (sort_by ==SORT_BY_HOTNESS )) { + c1 =stat_per_translation (tbs1, executions.normal); + c2 =stat_per_translation (tbs2, executions.normal); + }else if (likely (sort_by ==SORT_BY_HG )) { +if (tbs1->code.num_guest_inst ==0 ) { +return -1 ; + } +if (tbs2->code.num_guest_inst ==0 ) { +return 1 ; + } + +float a = + (float )stat_per_translation (tbs1, code.out_len) / tbs1->code.num_guest_inst; +float b = + (float )stat_per_translation (tbs2, code.out_len) / tbs2->code.num_guest_inst; + c1 = a <= b ?0 :1 ; + c2 = a <= b ?1 :0 ; + } + +return c1 < c2 ?1 : c1 == c2 ?0 :-1 ; +} + +static void dump_last_search_headers (int count) +{ +if (!last_search) { +qemu_log ("No data collected yet\n" ); +return ; + } + +GList *l = last_search; +while (l !=NULL && count--) { +TBStatistics *tbs = (TBStatistics *) l->data; +GList *next = l->next; +dump_tb_header (tbs); + l = next; + } +} + +static uint64_t calculate_last_search_coverages (void ) +{ +uint64_t total_exec_count =0 ; +GList *i; + +/* Compute total execution count for all tbs */ +for (i = last_search; i; i = i->next) { +TBStatistics *tbs = (TBStatistics *) i->data; + total_exec_count += + (tbs->executions.atomic + tbs->executions.normal) * tbs->code.num_guest_inst; + } + +for (i = last_search; i; i = i->next) { +TBStatistics *tbs = (TBStatistics *) i->data; +uint64_t tb_total_execs = + (tbs->executions.atomic + tbs->executions.normal) * tbs->code.num_guest_inst; + tbs->executions.coverage = (10000 * tb_total_execs) / (total_exec_count +1 ); + } + +return total_exec_count; +} + +static void do_dump_coverset_info (int percentage) +{ +mmap_lock (); +uint16_t total_coverage =0 ; +unsigned coverset_size =0 ; + percentage *=100 ; + id =1 ; +GList *i; + +g_list_free (last_search); + last_search =NULL ; + +qht_iter (&tb_ctx.tb_stats, collect_tb_stats,NULL ); + +int sort_by =SORT_BY_HOTNESS ; + last_search =g_list_sort_with_data (last_search, inverse_sort_tbs, &sort_by); + +if (!last_search) { +qemu_log ("No data collected yet\n" ); +return ; + } + +uint64_t total_exec_count =calculate_last_search_coverages (); + +/* Iterate and tbs display_id until reach the coverage percentage count */ +for (i = last_search; i && total_coverage < percentage; i = i->next) { +TBStatistics *tbs = (TBStatistics *) i->data; + tbs->display_id = id++; + coverset_size++; + total_coverage += tbs->executions.coverage; + } + +/* free the unused bits */ +if (i) { +if (i->next) { + i->next->prev =NULL ; + } +g_list_free (i->next); + i->next =NULL ; + } + +dump_last_search_headers (coverset_size); +mmap_unlock (); + +qemu_log ("------------------------------\n" ); +qemu_log ("%u TBs to reach %d%% of guest inst exec coverage\n" , + coverset_size, percentage /100 ); +qemu_log ("Total of guest insts exec: %lu" , total_exec_count); +qemu_log ("\n------------------------------\n" ); +} + +static void do_dump_tbs_info (int total,int sort_by) +{ + id =1 ; +GList *i; +int count = total; + +g_list_free (last_search); + last_search =NULL ; + +qht_iter (&tb_ctx.tb_stats, collect_tb_stats,NULL ); + + last_search =g_list_sort_with_data (last_search, inverse_sort_tbs, &sort_by); + +if (!last_search) { +qemu_printf ("No data collected yet!\n" ); +return ; + } + +calculate_last_search_coverages (); + +for (i = last_search; i && count--; i = i->next) { +TBStatistics *tbs = (TBStatistics *) i->data; + tbs->display_id = id++; + } + +/* free the unused bits */ +if (i) { +if (i->next) { + i->next->prev =NULL ; + } +g_list_free (i->next); + i->next =NULL ; + } + +dump_last_search_headers (total); +} + +static void +do_dump_coverset_info_safe (CPUState *cpu,run_on_cpu_data percentage) +{ +qemu_log_to_monitor (true); +do_dump_coverset_info (percentage.host_int); +qemu_log_to_monitor (false); +} + +struct tbs_dump_info { +int count; +int sort_by; +}; + +static void do_dump_tbs_info_safe (CPUState *cpu,run_on_cpu_data tbdi) +{ +struct tbs_dump_info *info = tbdi.host_ptr; +qemu_log_to_monitor (true); +do_dump_tbs_info (info->count, info->sort_by); +qemu_log_to_monitor (false); +g_free (info); +} + +/* +* When we dump_tbs_info on a live system via the HMP we want to +* ensure the system is quiessent before we start outputting stuff. +* Otherwise we could pollute the output with other logging output. +*/ +void dump_coverset_info (int percentage,bool use_monitor) +{ +if (use_monitor) { +async_safe_run_on_cpu (first_cpu, do_dump_coverset_info_safe, +RUN_ON_CPU_HOST_INT (percentage)); + }else { +do_dump_coverset_info (percentage); + } +} + +void dump_tbs_info (int count,int sort_by,bool use_monitor) +{ +if (use_monitor) { + struct tbs_dump_info *tbdi = g_new(struct tbs_dump_info, 1); + tbdi->count = count; + tbdi->sort_by = sort_by; +async_safe_run_on_cpu (first_cpu, do_dump_tbs_info_safe, +RUN_ON_CPU_HOST_PTR (tbdi)); + }else { +do_dump_tbs_info (count, sort_by); + } +} + +static GString *get_code_string (TBStatistics *tbs,int log_flags) +{ +int old_log_flags = qemu_loglevel; + +CPUState *cpu = first_cpu; +uint32_t cflags =curr_cflags () |CF_NOCACHE ; +TranslationBlock *tb =NULL ; + +GString *code_s =g_string_new (NULL ); +qemu_log_to_string (true, code_s); + +qemu_set_log (log_flags); + +if (sigsetjmp (cpu->jmp_env,0 ) ==0 ) { +mmap_lock (); + tb =tb_gen_code (cpu, tbs->pc, tbs->cs_base, tbs->flags, cflags); +tb_phys_invalidate (tb,-1 ); +mmap_unlock (); + }else { +/* +* The mmap_lock is dropped by tb_gen_code if it runs out of +* memory. +*/ +fprintf (stderr,"%s: dbg failed!\n" , __func__); +qemu_log ("\ncould not gen code for this TB\n" ); +assert_no_pages_locked (); + } + +qemu_set_log (old_log_flags); +qemu_log_to_string (false,NULL ); + +if (tb) { +tcg_tb_remove (tb); + } + +return code_s; +} + +static void do_tb_dump_with_statistics (TBStatistics *tbs,int log_flags) +{ +qemu_log ("\n------------------------------\n\n" ); +dump_tb_header (tbs); + +GString *code_s =get_code_string (tbs, log_flags); +qemu_log ("%s" , code_s->str); +g_string_free (code_s, true); +qemu_log ("------------------------------\n" ); +} + +struct tb_dump_info { +int id; +int log_flags; +bool use_monitor; +}; + +static void do_dump_tb_info_safe (CPUState *cpu,run_on_cpu_data info) +{ +struct tb_dump_info *tbdi = (struct tb_dump_info *) info.host_ptr; + +if (!last_search) { +qemu_log ("no search on record\n" ); +return ; + } + +qemu_log_to_monitor (tbdi->use_monitor); + +TBStatistics *tbs =get_tbstats_by_id (tbdi->id); +if (tbs) { +do_tb_dump_with_statistics (tbs, tbdi->log_flags); + }else { +qemu_log ("no TB statitics found with id %d\n" , tbdi->id); + } + +qemu_log_to_monitor (false); + +g_free (tbdi); +} + +void dump_tb_info (int id,int log_mask,bool use_monitor) +{ + struct tb_dump_info *tbdi = g_new(struct tb_dump_info, 1); + + tbdi->id = id; + tbdi->log_flags = log_mask; + tbdi->use_monitor = use_monitor; + +async_safe_run_on_cpu (first_cpu, do_dump_tb_info_safe, +RUN_ON_CPU_HOST_PTR (tbdi)); + +/* tbdi free'd by do_dump_tb_info_safe */ +} + +void enable_collect_tb_stats (void ) {init_tb_stats_htable_if_not ();accel/tcg/translate-all.c +1
-1@@ -1778,7 +1778,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu,* generation so we can count interesting things about this * generation. */ -if (tb_stats_collection_enabled ()) { +if (tb_stats_collection_enabled () && !(tb->cflags &CF_NOCACHE )) { tb->tb_stats =tb_get_stats (phys_pc, pc, cs_base, flags, tb);uint32_t flag =get_default_tbstats_flag ();disas.c +25
-6@@ -8,6 +8,8 @@#include "disas/disas.h" #include "disas/capstone.h" +#include "qemu/log-for-trace.h" + typedef struct CPUDebug { struct disassemble_info info; CPUState *cpu;@@ -420,6 +422,22 @@ static bool cap_disas_monitor(disassemble_info *info, uint64_t pc, int count)# define cap_disas_monitor (i, p, c) false#endif /* CONFIG_CAPSTONE */ +static int fprintf_log (struct _IO_FILE *a,const char *b, ...) +{ +va_list ap; +va_start (ap, b); + +if (!to_string) { +vfprintf (a, b, ap); + }else { +qemu_vlog (b, ap); + } + +va_end (ap); + +return 1 ; +} +/* Disassemble this for me please... (debugging). */ void target_disas (FILE *out,CPUState *cpu,target_ulong code,target_ulong size)@@ -429,7 +447,7 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong code,int count;CPUDebug s; -INIT_DISASSEMBLE_INFO (s.info, out, fprintf); +INIT_DISASSEMBLE_INFO (s.info, out, fprintf_log); s.cpu = cpu; s.info.read_memory_func = target_read_memory;@@ -460,11 +478,12 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong code, }for (pc = code; size >0 ; pc += count, size -= count) { -fprintf (out,"0x" TARGET_FMT_lx": " , pc); - count = s.info.print_insn (pc, &s.info); -fprintf (out,"\n" ); -if (count <0 ) -break ; +fprintf_log (out,"0x" TARGET_FMT_lx": " , pc); + count = s.info.print_insn (pc, &s.info); +fprintf_log (out,"\n" ); +if (count <0 ) { +break ; + }if (size < count) {fprintf (out, "Disassembler disagrees with translator over instruction "hmp-commands-info.hx +24
-0@@ -289,6 +289,30 @@ ETEXI .help = "show dynamic compiler info", .cmd = hmp_info_jit, }, + { + .name = "tb-list", + .args_type = "number:i?,sortedby:s?", + .params = "[number sortedby]", + .help = "show a [number] translated blocks sorted by [sortedby]" + "sortedby opts: hotness hg spills", + .cmd = hmp_info_tblist, + }, + { + .name = "tb", + .args_type = "id:i,flags:s?", + .params = "id [flag1,flag2,...]", + .help = "show information about one translated block by id." + "dump flags can be used to set dump code level: out_asm in_asm op", + .cmd = hmp_info_tb, + }, + { + .name = "coverset", + .args_type = "coverage:i?", + .params = "[coverage]", + .help = "show hottest translated blocks neccesary to cover" + "[coverage]% of the execution count", + .cmd = hmp_info_coverset, + }, #endif STEXIinclude/exec/tb-stats.h +43
-2@@ -9,8 +9,11 @@enum SortBy {SORT_BY_HOTNESS ,SORT_BY_HG /* Host/Guest */ ,SORT_BY_SPILLS };enum TbstatsCmd {START ,PAUSE ,STOP ,FILTER }; +#define tbs_stats_enabled (tbs,JIT_STATS ) \ + (tbs && (tbs->stats_enabled & JIT_STATS)) +#define tb_stats_enabled (tb,JIT_STATS ) \ - (tb && tb->tb_stats && (tb->tb_stats->stats_enabled & JIT_STATS)) + (tb && tb->tb_stats && tbs_stats_enabled(tb->tb_stats, JIT_STATS))#define stat_per_translation (stat, name) \ (stat->translations.total ? stat->name / stat->translations.total : 0)@@ -38,6 +41,8 @@ struct TBStatistics {struct {unsigned long normal;unsigned long atomic; +/* filled only when dumping x% cover set */ +uint16_t coverage; } executions;struct {@@ -56,7 +61,6 @@ struct TBStatistics {struct {unsigned long total; -unsigned long uncached;unsigned long spanning; } translations;@@ -69,6 +73,9 @@ struct TBStatistics {int64_t la; } time; +/* HMP information - used for referring to previous search */ +int display_id; +/* current TB linked to this TBStatistics */ TranslationBlock *tb; };@@ -89,6 +96,40 @@ struct TbstatsCommand {void do_hmp_tbstats_safe (CPUState *cpu,run_on_cpu_data icmd); +/** +* dump_coverset_info: report the hottest blocks to cover n% of execution +* +* @percentage: cover set percentage +* @use_monitor: redirect output to monitor +* +* Report the hottest blocks to either the log or monitor +*/ +void dump_coverset_info (int percentage,bool use_monitor); + + +/** +* dump_tbs_info: report the hottest blocks +* +* @count: the limit of hotblocks +* @sort_by: property in which the dump will be sorted +* @use_monitor: redirect output to monitor +* +* Report the hottest blocks to either the log or monitor +*/ +void dump_tbs_info (int count,int sort_by,bool use_monitor); + +/** +* dump_tb_info: dump information about one TB +* +* @id: the display id of the block (from previous search) +* @mask: the temporary logging mask +* @Use_monitor: redirect output to monitor +* +* Re-run a translation of a block at addr for the purposes of debug output +*/ +void dump_tb_info (int id,int log_mask,bool use_monitor); + +/* TBStatistic collection controls */ void enable_collect_tb_stats (void );void disable_collect_tb_stats (void );include/qemu/log-for-trace.h +4
-0@@ -20,6 +20,9 @@/* Private global variable, don't use */ extern int qemu_loglevel; +extern bool to_string; + +extern int32_t max_num_hot_tbs_to_dump;#define LOG_TRACE (1 << 15)@@ -31,5 +34,6 @@ static inline bool qemu_loglevel_mask(int mask)/* main logging function */ int GCC_FMT_ATTR(1, 2) qemu_log(const char *fmt, ...); +int qemu_vlog(const char *fmt, va_list va);#endif include/qemu/log.h +2
-0@@ -114,6 +114,8 @@ typedef struct QEMULogItem {extern const QEMULogItem qemu_log_items[];void qemu_set_log (int log_flags); +void qemu_log_to_monitor (bool enable); +void qemu_log_to_string (bool enable,GString *s);void qemu_log_needs_buffers (void );void qemu_set_log_filename (const char *filename,Error **errp);void qemu_set_dfilter_ranges (const char *ranges,Error **errp);monitor/misc.c +74
-0@@ -504,6 +504,80 @@ static void hmp_tbstats(Monitor *mon, const QDict *qdict) } +static void hmp_info_tblist (Monitor *mon,const QDict *qdict) +{ +int number_int; +const char *sortedby_str =NULL ; +if (!tcg_enabled ()) { +error_report ("TB information is only available with accel=tcg" ); +return ; + } +if (!tb_ctx.tb_stats.map) { +error_report ("no TB information recorded" ); +return ; + } + + number_int =qdict_get_try_int (qdict,"number" ,10 ); + sortedby_str =qdict_get_try_str (qdict,"sortedby" ); + +int sortedby =SORT_BY_HOTNESS ; +if (sortedby_str ==NULL ||strcmp (sortedby_str,"hotness" ) ==0 ) { + sortedby =SORT_BY_HOTNESS ; + }else if (strcmp (sortedby_str,"hg" ) ==0 ) { + sortedby =SORT_BY_HG ; + }else if (strcmp (sortedby_str,"spills" ) ==0 ) { + sortedby =SORT_BY_SPILLS ; + }else { +error_report ("valid sort options are: hotness hg spills" ); +return ; + } + +dump_tbs_info (number_int, sortedby, true); +} + +static void hmp_info_tb (Monitor *mon,const QDict *qdict) +{ +const int id =qdict_get_int (qdict,"id" ); +const char *flags =qdict_get_try_str (qdict,"flags" ); +int mask; + +if (!tcg_enabled ()) { +error_report ("TB information is only available with accel=tcg" ); +return ; + } + + mask = flags ?qemu_str_to_log_mask (flags) :CPU_LOG_TB_IN_ASM ; + +if (!mask) { +error_report ("Unable to parse log flags, see 'help log'" ); +return ; + } + +dump_tb_info (id, mask, true); +} + +static void hmp_info_coverset (Monitor *mon,const QDict *qdict) +{ +int coverage; +if (!tcg_enabled ()) { +error_report ("TB information is only available with accel=tcg" ); +return ; + } +if (!tb_stats_collection_enabled ()) { +error_report ("TB information not being recorded" ); +return ; + } + + coverage =qdict_get_try_int (qdict,"coverage" ,90 ); + +if (coverage <0 || coverage >100 ) { +error_report ("Coverset percentage should be between 0 and 100" ); +return ; + } + +dump_coverset_info (coverage, true); +} +static void hmp_info_jit (Monitor *mon,const QDict *qdict) {if (!tcg_enabled ()) {util/log.c +41
-11@@ -33,28 +33,58 @@ int qemu_loglevel;static int log_append =0 ;static GArray *debug_regions;int32_t max_num_hot_tbs_to_dump; +static bool to_monitor; +bool to_string;int tcg_collect_tb_stats;uint32_t default_tbstats_flag; -/* Return the number of characters emitted. */ -int qemu_log (const char *fmt, ...) +GString *string; + +int qemu_vlog (const char *fmt,va_list va) {int ret =0 ; -if (qemu_logfile) { -va_list ap; -va_start (ap, fmt); - ret =vfprintf (qemu_logfile, fmt, ap); -va_end (ap); - -/* Don't pass back error results. */ -if (ret <0 ) { - ret =0 ; +if (to_string) { +if (string) { +g_string_append_vprintf (string, fmt, va); } + }else if (to_monitor) { + ret =qemu_vprintf (fmt, va); + }else if (qemu_logfile) { + ret =vfprintf (qemu_logfile, fmt, va); + } + +/* Don't pass back error results. */ +if (ret <0 ) { + ret =0 ; }return ret; } +/* Return the number of characters emitted. */ +int qemu_log (const char *fmt, ...) +{ +int ret =0 ; +va_list ap; +va_start (ap, fmt); + + ret =qemu_vlog (fmt, ap); + +va_end (ap); +return ret; +} + +void qemu_log_to_monitor (bool enable) +{ + to_monitor = enable; +} + +void qemu_log_to_string (bool enable,GString *s) +{ + to_string = enable; + string = s; +} +static bool log_uses_own_buffers;/* enable or disable low levels log */ Signature · 1 line
2.22.0
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
PATCH v6 9/10 monitor: adding new info cfg command
In reply to vandersonmrAdding "info cfg id depth" commands to HMP.
This command allow the exploration a TB
neighbors by dumping [and opening] a .dot
file with the TB CFG neighbors colorized
by their hotness.
The goal of this command is to allow the dynamic exploration of TCG behavior and code quality. Therefore, for now, a corresponding QMP command is not worthwhile.
--- accel/tcg/tb-stats.c | 169 ++++++++++++++++++++++++++++++++++++++++ hmp-commands-info.hx | 7 ++ include/exec/tb-stats.h | 1 + monitor/misc.c | 22 ++++++ 4 files changed, 199 insertions(+)
accel/tcg/tb-stats.c +169 -0
@@ -657,6 +657,174 @@ void dump_tb_info(int id, int log_mask, bool use_monitor)/* tbdi free'd by do_dump_tb_info_safe */ } +/* TB CFG xdot/dot dump implementation */ +#define MAX_CFG_NUM_NODES 1000 +static int cfg_tb_id; +static GHashTable *cfg_nodes; +static uint64_t root_count; + +static void fputs_jump (TBStatistics *from,TBStatistics *to,FILE *dot) +{ +if (!from || !to) { +return ; + } + +int *from_id = (int *)g_hash_table_lookup (cfg_nodes, from); +int *to_id = (int *)g_hash_table_lookup (cfg_nodes, to); + +if (!from_id || !to_id) { +return ; + } + +GString *line =g_string_new (NULL ); + +g_string_printf (line," node_%d -> node_%d;\n" , *from_id, *to_id); + +fputs (line->str, dot); + +g_string_free (line, true); +} + +static void fputs_tbstats (TBStatistics *tbs,FILE *dot,int log_flags) +{ +if (!tbs) { +return ; + } + +GString *line =g_string_new (NULL );; + +uint32_t color =0xFF666 ; +uint64_t count = tbs->executions.normal; +if (count >1.6 * root_count) { + color =0xFF000 ; + }else if (count >1.2 * root_count) { + color =0xFF333 ; + }else if (count <0.4 * root_count) { + color =0xFFCCC ; + }else if (count <0.8 * root_count) { + color =0xFF999 ; + } + +GString *code_s =get_code_string (tbs, log_flags); + +for (int i =0 ; i < code_s->len; i++) { +if (code_s->str[i] =='\n' ) { + code_s->str[i] =' ' ; + code_s =g_string_insert (code_s, i,"\\l" ); + i +=2 ; + } + } + +g_string_printf (line, +" node_%d [fillcolor=\"#%xFF0000\" shape=\"record\" " +"label=\"TB %d\\l" +"-------------\\l" +"PC:\t0x" TARGET_FMT_lx"\\l" +"exec count:\t%lu\\l" +"\\l %s\"];\n" , + cfg_tb_id, color, cfg_tb_id, tbs->pc, + tbs->executions.normal, code_s->str); + +fputs (line->str, dot); + +int *id =g_new (int,1 ); + *id = cfg_tb_id; +g_hash_table_insert (cfg_nodes, tbs, id); + + cfg_tb_id++; + +g_string_free (line, true); +g_string_free (code_s, true); +} + +static void fputs_preorder_walk (TBStatistics *tbs,int depth,FILE *dot,int log_flags) +{ +if (tbs && depth >0 + && cfg_tb_id <MAX_CFG_NUM_NODES + && !g_hash_table_contains (cfg_nodes, tbs)) { + +fputs_tbstats (tbs, dot, log_flags); + +if (tbs->tb) { +TranslationBlock *left_tb =NULL ; +TranslationBlock *right_tb =NULL ; +if (tbs->tb->jmp_dest[0 ]) { + left_tb = (TranslationBlock *)atomic_read (tbs->tb->jmp_dest); + } +if (tbs->tb->jmp_dest[1 ]) { + right_tb = (TranslationBlock *)atomic_read (tbs->tb->jmp_dest +1 ); + } + +if (left_tb) { +fputs_preorder_walk (left_tb->tb_stats, depth -1 , dot, log_flags); +fputs_jump (tbs, left_tb->tb_stats, dot); + } +if (right_tb) { +fputs_preorder_walk (right_tb->tb_stats, depth -1 , dot, log_flags); +fputs_jump (tbs, right_tb->tb_stats, dot); + } + } + } +} + +struct PreorderInfo { +TBStatistics *tbs; +int depth; +int log_flags; +}; + +static void fputs_preorder_walk_safe (CPUState *cpu,run_on_cpu_data icmd) +{ +struct PreorderInfo *info = icmd.host_ptr; + +GString *file_name =g_string_new (NULL );; +g_string_printf (file_name,"/tmp/qemu-cfg-tb-%d-%d.dot" , id, info->depth); +FILE *dot =fopen (file_name->str,"w+" ); + +fputs ( +"digraph G {\n" +" mclimit=1.5;\n" +" rankdir=TD; ordering=out;\n" +" graph[fontsize=10 fontname=\"Verdana\"];\n" +" color=\"#efefef\";\n" +" node[shape=box style=filled fontsize=8 fontname=\"Verdana\" fillcolor=\"#efefef\"];\n" +" edge[fontsize=8 fontname=\"Verdana\"];\n" + , dot); + + cfg_nodes =g_hash_table_new (NULL ,NULL ); +fputs_preorder_walk (info->tbs, info->depth, dot, info->log_flags); +g_hash_table_destroy (cfg_nodes); + +fputs ("}\n\0" , dot); +fclose (dot); + +qemu_log ("CFG dumped: %s\n" , file_name->str); + +g_string_free (file_name, true); +g_free (info); +} + +void dump_tb_cfg (int id,int depth,int log_flags) +{ + cfg_tb_id =1 ; + root_count =0 ; + +/* do a pre-order walk in the CFG with a limited depth */ +TBStatistics *root =get_tbstats_by_id (id); +if (root) { + root_count = root->executions.normal; + } + + struct PreorderInfo *info = g_new(struct PreorderInfo, 1); + info->tbs = root; + info->depth = depth +1 ; + info->log_flags = log_flags; +async_safe_run_on_cpu (first_cpu, fputs_preorder_walk_safe, +RUN_ON_CPU_HOST_PTR (info)); +} + +/* TBStatistic collection controls */ +void enable_collect_tb_stats (void ) {
@@ -706,3 +874,4 @@ uint32_t get_default_tbstats_flag(void) {return default_tbstats_flag; } +
hmp-commands-info.hx +7 -0
@@ -305,6 +305,13 @@ ETEXI "dump flags can be used to set dump code level: out_asm in_asm op", .cmd = hmp_info_tb, }, + { + .name = "cfg", + .args_type = "id:i,depth:i?,flags:s?", + .params = "id [depth flags]", + .help = "plot CFG around TB with the given id", + .cmd = hmp_info_cfg, + }, { .name = "coverset", .args_type = "coverage:i?",
include/exec/tb-stats.h +1 -0
@@ -129,6 +129,7 @@ void dump_tbs_info(int count, int sort_by, bool use_monitor);*/ void dump_tb_info (int id,int log_mask,bool use_monitor); +void dump_tb_cfg (int id,int depth,int log_flags);/* TBStatistic collection controls */ void enable_collect_tb_stats (void );
monitor/misc.c +22 -0
@@ -556,6 +556,28 @@ static void hmp_info_tb(Monitor *mon, const QDict *qdict)dump_tb_info (id, mask, true); } +static void hmp_info_cfg (Monitor *mon,const QDict *qdict) +{ +const int id =qdict_get_int (qdict,"id" ); +const int depth =qdict_get_try_int (qdict,"depth" ,3 ); +const char *flags =qdict_get_try_str (qdict,"flags" ); +int mask; + +if (!tcg_enabled ()) { +error_report ("TB information is only available with accel=tcg" ); +return ; + } + + mask = flags ?qemu_str_to_log_mask (flags) :CPU_LOG_TB_IN_ASM ; + +if (!mask) { +error_report ("Unable to parse log flags, see 'help log'" ); +return ; + } + +dump_tb_cfg (id, depth, mask); +} +static void hmp_info_coverset (Monitor *mon,const QDict *qdict) {int coverage;
Signature · 1 line
2.22.0
Re: [Qemu-devel] [PATCH v6 09/10] monitor: adding new info cfg command
Quoted 42 lines · * vandersonmr ([email protected]) wrote:
Adding "info cfg id depth" commands to HMP.
This command allow the exploration a TB
neighbors by dumping [and opening] a .dot
file with the TB CFG neighbors colorized
by their hotness.The goal of this command is to allow the dynamic exploration of TCG behavior and code quality. Therefore, for now, a corresponding QMP command is not worthwhile.
Signed-off-by Vanderson M. do Rosario <[email protected]>--- accel/tcg/tb-stats.c | 169 ++++++++++++++++++++++++++++++++++++++++ hmp-commands-info.hx | 7 ++ include/exec/tb-stats.h | 1 + monitor/misc.c | 22 ++++++ 4 files changed, 199 insertions(+)accel/tcg/tb-stats.c +16
-0@@ -657,6 +657,174 @@ void dump_tb_info(int id, int log_mask, bool use_monitor)/* tbdi free'd by do_dump_tb_info_safe */ } +/* TB CFG xdot/dot dump implementation */ +#define MAX_CFG_NUM_NODES 1000 +static int cfg_tb_id; +static GHashTable *cfg_nodes; +static uint64_t root_count; + +static void fputs_jump (TBStatistics *from,TBStatistics *to,FILE *dot) +{ +if (!from || !to) { +return ; + } + +int *from_id = (int *)g_hash_table_lookup (cfg_nodes, from); +int *to_id = (int *)g_hash_table_lookup (cfg_nodes, to); + +if (!from_id || !to_id) {
accel/tcg/tb-stats.c void dump_tb_info(int id, int log_mask, bool use_monitor) · line 685
Quoted 10 lines
accel/tcg/tb-stats.c +10
-0+return ; + } + +GString *line =g_string_new (NULL ); + +g_string_printf (line," node_%d -> node_%d;\n" , *from_id, *to_id); + +fputs (line->str, dot); + +g_string_free (line, true);
Why not just:
fprintf(dot, " node_%d -> node_%d;\n", *from_id, *to_id);
and similar below.
Quoted 11 lines
accel/tcg/tb-stats.c +11
-0+} + +static void fputs_tbstats (TBStatistics *tbs,FILE *dot,int log_flags) +{ +if (!tbs) { +return ; + } + +GString *line =g_string_new (NULL );; + +uint32_t color =0xFF666 ;
accel/tcg/tb-stats.c void dump_tb_info(int id, int log_mask, bool use_monitor) · line 706
Quoted 10 lines
accel/tcg/tb-stats.c +10
-0+uint64_t count = tbs->executions.normal; +if (count >1.6 * root_count) { + color =0xFF000 ; + }else if (count >1.2 * root_count) { + color =0xFF333 ; + }else if (count <0.4 * root_count) { + color =0xFFCCC ; + }else if (count <0.8 * root_count) { + color =0xFF999 ; + }
Lots of magical constants with no comments; preferably put constants in separate defines and comment them.
Quoted 195 lines
accel/tcg/tb-stats.c +122
-0+ +GString *code_s =get_code_string (tbs, log_flags); + +for (int i =0 ; i < code_s->len; i++) { +if (code_s->str[i] =='\n' ) { + code_s->str[i] =' ' ; + code_s =g_string_insert (code_s, i,"\\l" ); + i +=2 ; + } + } + +g_string_printf (line, +" node_%d [fillcolor=\"#%xFF0000\" shape=\"record\" " +"label=\"TB %d\\l" +"-------------\\l" +"PC:\t0x" TARGET_FMT_lx"\\l" +"exec count:\t%lu\\l" +"\\l %s\"];\n" , + cfg_tb_id, color, cfg_tb_id, tbs->pc, + tbs->executions.normal, code_s->str); + +fputs (line->str, dot); + +int *id =g_new (int,1 ); + *id = cfg_tb_id; +g_hash_table_insert (cfg_nodes, tbs, id); + + cfg_tb_id++; + +g_string_free (line, true); +g_string_free (code_s, true); +} + +static void fputs_preorder_walk (TBStatistics *tbs,int depth,FILE *dot,int log_flags) +{ +if (tbs && depth >0 + && cfg_tb_id <MAX_CFG_NUM_NODES + && !g_hash_table_contains (cfg_nodes, tbs)) { + +fputs_tbstats (tbs, dot, log_flags); + +if (tbs->tb) { +TranslationBlock *left_tb =NULL ; +TranslationBlock *right_tb =NULL ; +if (tbs->tb->jmp_dest[0 ]) { + left_tb = (TranslationBlock *)atomic_read (tbs->tb->jmp_dest); + } +if (tbs->tb->jmp_dest[1 ]) { + right_tb = (TranslationBlock *)atomic_read (tbs->tb->jmp_dest +1 ); + } + +if (left_tb) { +fputs_preorder_walk (left_tb->tb_stats, depth -1 , dot, log_flags); +fputs_jump (tbs, left_tb->tb_stats, dot); + } +if (right_tb) { +fputs_preorder_walk (right_tb->tb_stats, depth -1 , dot, log_flags); +fputs_jump (tbs, right_tb->tb_stats, dot); + } + } + } +} + +struct PreorderInfo { +TBStatistics *tbs; +int depth; +int log_flags; +}; + +static void fputs_preorder_walk_safe (CPUState *cpu,run_on_cpu_data icmd) +{ +struct PreorderInfo *info = icmd.host_ptr; + +GString *file_name =g_string_new (NULL );; +g_string_printf (file_name,"/tmp/qemu-cfg-tb-%d-%d.dot" , id, info->depth); +FILE *dot =fopen (file_name->str,"w+" ); + +fputs ( +"digraph G {\n" +" mclimit=1.5;\n" +" rankdir=TD; ordering=out;\n" +" graph[fontsize=10 fontname=\"Verdana\"];\n" +" color=\"#efefef\";\n" +" node[shape=box style=filled fontsize=8 fontname=\"Verdana\" fillcolor=\"#efefef\"];\n" +" edge[fontsize=8 fontname=\"Verdana\"];\n" + , dot); + + cfg_nodes =g_hash_table_new (NULL ,NULL ); +fputs_preorder_walk (info->tbs, info->depth, dot, info->log_flags); +g_hash_table_destroy (cfg_nodes); + +fputs ("}\n\0" , dot); +fclose (dot); + +qemu_log ("CFG dumped: %s\n" , file_name->str); + +g_string_free (file_name, true); +g_free (info); +} + +void dump_tb_cfg (int id,int depth,int log_flags) +{ + cfg_tb_id =1 ; + root_count =0 ; + +/* do a pre-order walk in the CFG with a limited depth */ +TBStatistics *root =get_tbstats_by_id (id); +if (root) { + root_count = root->executions.normal; + } + + struct PreorderInfo *info = g_new(struct PreorderInfo, 1); + info->tbs = root; + info->depth = depth +1 ; + info->log_flags = log_flags; +async_safe_run_on_cpu (first_cpu, fputs_preorder_walk_safe, +RUN_ON_CPU_HOST_PTR (info)); +} + +/* TBStatistic collection controls */ +void enable_collect_tb_stats (void ) {@@ -706,3 +874,4 @@ uint32_t get_default_tbstats_flag(void) {return default_tbstats_flag; } +hmp-commands-info.hx +7
-0@@ -305,6 +305,13 @@ ETEXI "dump flags can be used to set dump code level: out_asm in_asm op", .cmd = hmp_info_tb, }, + { + .name = "cfg", + .args_type = "id:i,depth:i?,flags:s?", + .params = "id [depth flags]", + .help = "plot CFG around TB with the given id", + .cmd = hmp_info_cfg, + }, { .name = "coverset", .args_type = "coverage:i?",include/exec/tb-stats.h +1
-0@@ -129,6 +129,7 @@ void dump_tbs_info(int count, int sort_by, bool use_monitor);*/ void dump_tb_info (int id,int log_mask,bool use_monitor); +void dump_tb_cfg (int id,int depth,int log_flags);/* TBStatistic collection controls */ void enable_collect_tb_stats (void );monitor/misc.c +22
-0@@ -556,6 +556,28 @@ static void hmp_info_tb(Monitor *mon, const QDict *qdict)dump_tb_info (id, mask, true); } +static void hmp_info_cfg (Monitor *mon,const QDict *qdict) +{ +const int id =qdict_get_int (qdict,"id" ); +const int depth =qdict_get_try_int (qdict,"depth" ,3 ); +const char *flags =qdict_get_try_str (qdict,"flags" ); +int mask; + +if (!tcg_enabled ()) { +error_report ("TB information is only available with accel=tcg" ); +return ; + } + + mask = flags ?qemu_str_to_log_mask (flags) :CPU_LOG_TB_IN_ASM ; + +if (!mask) { +error_report ("Unable to parse log flags, see 'help log'" ); +return ; + } + +dump_tb_cfg (id, depth, mask); +} +static void hmp_info_coverset (Monitor *mon,const QDict *qdict) {int coverage;Signature · 1 line
2.22.0
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
PATCH v6 10/10 linux-user: dumping hot TBs at the end of the execution
In reply to vandersonmrdumps, in linux-user mode, the hottest TBs if -d tb_stats is used.
Example of output for the 3 hottest TBs:
TB id:1 | phys:0x34d54 virt:0x0000000000034d54 flags:0x0000f0
| exec:4828932/0 guest inst cov:16.38%
| trans:1 ints: g:3 op:82 op_opt:34 spills:3
| h/g (host bytes / guest insts): 90.666664
| time to gen at 2.4GHz => code:3150.83(ns) IR:712.08(ns)
| targets: 0x0000000000034d5e (id:11), 0x0000000000034d0d (id:2)TB id:2 | phys:0x34d0d virt:0x0000000000034d0d flags:0x0000f0
| exec:4825842/0 guest inst cov:21.82%
| trans:1 ints: g:4 op:80 op_opt:38 spills:2
| h/g (host bytes / guest insts): 84.000000
| time to gen at 2.4GHz => code:3362.92(ns) IR:793.75(ns)
| targets: 0x0000000000034d19 (id:12), 0x0000000000034d54 (id:1)TB id:3 | phys:0xec1c1 virt:0x00000000000ec1c1 flags:0x0000b0
| exec:872032/0 guest inst cov:1.97%
| trans:1 ints: g:2 op:56 op_opt:26 spills:1
| h/g (host bytes / guest insts): 68.000000
| time to gen at 2.4GHz => code:1692.08(ns) IR:473.75(ns)
| targets: 0x00000000000ec1c5 (id:4), 0x00000000000ec1cb (id:13)--- linux-user/exit.c | 4 ++++ 1 file changed, 4 insertions(+)
linux-user/exit.c +4 -0
@@ -28,6 +28,10 @@ extern void __gcov_dump(void);void preexit_cleanup (CPUArchState *env,int code) { +if (tb_stats_collection_enabled ()) { +dump_tbs_info (max_num_hot_tbs_to_dump,SORT_BY_HOTNESS , false); + } +#ifdef TARGET_GPROF _mcleanup ();#endif
Signature · 1 line
2.22.0