TCG code quality tracking
v13 cover TCG code quality tracking
v12
---
* remove CONFIG_PROFILER completely at the first
* squash original patches 3-8 into one
* use Richard's inline version gen_tb_exec_count
* convert how-to to rst format as suggested by Thomas
* small change to patch 6 of hmp command
Alex Bennée (1):
tb-stats: reset the tracked TBs on a tb_flush
Fei Wu (3):
accel/tcg: remove CONFIG_PROFILER accel/tcg: add jit stats and time to TBStatistics
docs: add tb-stats how to
Vanderson M. do Rosario (6):
accel/tcg: introduce TBStatistics structure
accel: collecting TB execution count
debug: add -d tb_stats to control TBStatistics collection:
monitor: adding tb_stats hmp command
Adding info [tb-list|tb] commands to HMP (WIP)
tb-stats: dump hot TBs at the end of the execution
MAINTAINERS | 1 + accel/tcg/cpu-exec.c | 6 + accel/tcg/meson.build | 1 + accel/tcg/monitor.c | 122 +++++- accel/tcg/tb-context.h | 1 + accel/tcg/tb-hash.h | 7 + accel/tcg/tb-maint.c | 20 + accel/tcg/tb-stats.c | 692 ++++++++++++++++++++++++++++++++++ accel/tcg/tcg-accel-ops.c | 15 +- accel/tcg/tcg-runtime.c | 1 + accel/tcg/translate-all.c | 147 ++++++-- accel/tcg/translator.c | 28 ++ disas/disas.c | 26 +- docs/devel/tcg-tbstats.rst | 129 +++++++ hmp-commands-info.hx | 16 + hmp-commands.hx | 16 + include/exec/exec-all.h | 3 + include/exec/gen-icount.h | 2 + include/exec/tb-stats-dump.h | 21 ++ include/exec/tb-stats-flags.h | 34 ++ include/exec/tb-stats.h | 164 ++++++++ include/monitor/hmp.h | 3 + include/qemu/log-for-trace.h | 6 +- include/qemu/log.h | 3 + include/qemu/timer.h | 5 +- include/tcg/tcg.h | 50 ++- linux-user/exit.c | 2 + meson.build | 2 - meson_options.txt | 2 - scripts/meson-buildoptions.sh | 3 - softmmu/runstate.c | 10 +- stubs/meson.build | 1 + stubs/tb-stats.c | 32 ++ tcg/tcg.c | 224 +++-------- tests/qtest/qmp-cmd-test.c | 2 +- util/log.c | 103 ++++- 36 files changed, 1614 insertions(+), 286 deletions(-) create mode 100644 accel/tcg/tb-stats.c create mode 100644 docs/devel/tcg-tbstats.rst create mode 100644 include/exec/tb-stats-dump.h create mode 100644 include/exec/tb-stats-flags.h create mode 100644 include/exec/tb-stats.h create mode 100644 stubs/tb-stats.c
Signature · 1 line
2.25.1
PATCH v13 1/10 accel/tcg: remove CONFIG_PROFILER
TBStats will be introduced to replace CONFIG_PROFILER totally, here remove all CONFIG_PROFILER related stuffs first.
--- accel/tcg/monitor.c | 25 ---- accel/tcg/tcg-accel-ops.c | 10 -- accel/tcg/translate-all.c | 33 ------ include/qemu/timer.h | 9 -- include/tcg/tcg.h | 25 ---- meson.build | 2 - meson_options.txt | 2 - scripts/meson-buildoptions.sh | 3 - softmmu/runstate.c | 9 -- tcg/tcg.c | 208 ---------------------------------- tests/qtest/qmp-cmd-test.c | 3 - 11 files changed, 329 deletions(-)
accel/tcg/monitor.c +0 -25
@@ -80,36 +80,11 @@ HumanReadableText *qmp_x_query_opcount(Error **errp)return human_readable_text_from_str (buf); } -#ifdef CONFIG_PROFILER - -int64_t dev_time; - -HumanReadableText *qmp_x_query_profile (Error **errp) -{ -g_autoptr (GString) buf =g_string_new ("" ); -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; - -g_string_append_printf (buf,"async time %" PRId64" (%0.3f)\n" , - dev_time, dev_time / (double )NANOSECONDS_PER_SECOND ); -g_string_append_printf (buf,"qemu time %" PRId64" (%0.3f)\n" , - delta, delta / (double )NANOSECONDS_PER_SECOND ); - last_cpu_exec_time = cpu_exec_time; - dev_time =0 ; - -return human_readable_text_from_str (buf); -} -#else HumanReadableText *qmp_x_query_profile (Error **errp) {error_setg (errp,"Internal profiler not compiled" );return NULL ; } -#endif static void hmp_tcg_register (void ) {
accel/tcg/tcg-accel-ops.c +0 -10
@@ -70,20 +70,10 @@ void tcg_cpus_destroy(CPUState *cpu)int tcg_cpus_exec (CPUState *cpu) {int ret; -#ifdef CONFIG_PROFILER -int64_t ti; -#endif 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 -qatomic_set (&tcg_ctx->prof.cpu_exec_time, - tcg_ctx->prof.cpu_exec_time +profile_getclock () - ti); -#endif return ret; }
accel/tcg/translate-all.c +0 -33
@@ -203,10 +203,6 @@ void cpu_restore_state_from_tb(CPUState *cpu, TranslationBlock *tb, uintptr_t host_pc) {uint64_t data[TARGET_INSN_START_WORDS ]; -#ifdef CONFIG_PROFILER -TCGProfile *prof = &tcg_ctx->prof; -int64_t ti =profile_getclock (); -#endif int insns_left =cpu_unwind_data_from_tb (tb, host_pc, data);if (insns_left <0 ) {
@@ -223,12 +219,6 @@ void cpu_restore_state_from_tb(CPUState *cpu, TranslationBlock *tb, } cpu->cc->tcg_ops->restore_state_to_opc (cpu, tb, data); - -#ifdef CONFIG_PROFILER -qatomic_set (&prof->restore_time, - prof->restore_time +profile_getclock () - ti); -qatomic_set (&prof->restore_count, prof->restore_count +1 ); -#endif }bool cpu_restore_state (CPUState *cpu,uintptr_t host_pc)
@@ -291,13 +281,6 @@ static int setjmp_gen_code(CPUArchState *env, TranslationBlock *tb, tcg_ctx->cpu =NULL ; *max_insns = tb->icount; -#ifdef CONFIG_PROFILER -qatomic_set (&tcg_ctx->prof.tb_count, tcg_ctx->prof.tb_count +1 ); -qatomic_set (&tcg_ctx->prof.interm_time, - tcg_ctx->prof.interm_time +profile_getclock () - *ti); - *ti =profile_getclock (); -#endif -return tcg_gen_code (tcg_ctx, tb, pc); }
@@ -311,9 +294,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu,tb_page_addr_t phys_pc;tcg_insn_unit *gen_code_buf;int gen_code_size, search_size, max_insns; -#ifdef CONFIG_PROFILER -TCGProfile *prof = &tcg_ctx->prof; -#endif int64_t ti;void *host_pc;
@@ -365,12 +345,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu, tb_overflow: -#ifdef CONFIG_PROFILER -/* includes aborted translations because of exceptions */ -qatomic_set (&prof->tb_count1, prof->tb_count1 +1 ); - ti =profile_getclock (); -#endif -trace_translate_block (tb, pc, tb->tc.ptr); gen_code_size =setjmp_gen_code (env, tb, pc, host_pc, &max_insns, &ti);
@@ -425,13 +399,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu,*/ perf_report_code (pc, tb,tcg_splitwx_to_rx (gen_code_buf)); -#ifdef CONFIG_PROFILER -qatomic_set (&prof->code_time, prof->code_time +profile_getclock () - ti); -qatomic_set (&prof->code_in_len, prof->code_in_len + tb->size); -qatomic_set (&prof->code_out_len, prof->code_out_len + gen_code_size); -qatomic_set (&prof->search_out_len, prof->search_out_len + search_size); -#endif -if (qemu_loglevel_mask (CPU_LOG_TB_OUT_ASM ) &&qemu_log_in_addr_range (pc)) {FILE *logfile =qemu_log_trylock ();
include/qemu/timer.h +0 -9
@@ -989,13 +989,4 @@ 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 -#endif
include/tcg/tcg.h +0 -25
@@ -522,27 +522,6 @@ static inline TCGRegSet output_pref(const TCGOp *op, unsigned i)return i <ARRAY_SIZE (op->output_pref) ? op->output_pref[i] :0 ; } -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; -int64_t opt_time; -int64_t restore_count; -int64_t restore_time; -int64_t table_op_count[NB_OPS ]; -}TCGProfile ; -struct TCGContext {uint8_t *pool_cur, *pool_end;TCGPool *pool_first, *pool_current, *pool_first_large;
@@ -569,10 +548,6 @@ struct TCGContext {tcg_insn_unit *code_buf;/* pointer for start of tb */ tcg_insn_unit *code_ptr;/* pointer for running end of tb */ -#ifdef CONFIG_PROFILER -TCGProfile prof; -#endif -#ifdef CONFIG_DEBUG_TCG int goto_tb_issue_mask;const TCGOpcode *vecop_list;
meson.build +0 -2
@@ -2141,7 +2141,6 @@ if numa.found() dependencies: numa)) endif config_host_data.set('CONFIG_OPENGL', opengl.found()) -config_host_data.set('CONFIG_PROFILER', get_option('profiler')) config_host_data.set('CONFIG_RBD', rbd.found()) config_host_data.set('CONFIG_RDMA', rdma.found()) config_host_data.set('CONFIG_SAFESTACK', get_option('safe_stack'))
@@ -4110,7 +4109,6 @@ if 'objc' in all_languages summary_info += {'QEMU_OBJCFLAGS': ' '.join(qemu_common_flags)} endif summary_info += {'QEMU_LDFLAGS': ' '.join(qemu_ldflags)} -summary_info += {'profiler': get_option('profiler')} summary_info += {'link-time optimization (LTO)': get_option('b_lto')} summary_info += {'PIE': get_option('b_pie')} summary_info += {'static build': config_host.has_key('CONFIG_STATIC')}
meson_options.txt +0 -2
@@ -345,8 +345,6 @@ option('qom_cast_debug', type: 'boolean', value: true, option('gprof', type: 'boolean', value: false, description: 'QEMU profiling with gprof', deprecated: true) -option('profiler', type: 'boolean', value: false, - description: 'profiler support') option('slirp_smbd', type : 'feature', value : 'auto', description: 'use smbd (at path --smbd=*) in slirp networking')
scripts/meson-buildoptions.sh +0 -3
@@ -39,7 +39,6 @@ meson_options_help() { printf "%s\n" ' jemalloc/system/tcmalloc)' printf "%s\n" ' --enable-module-upgrades try to load modules from alternate paths for' printf "%s\n" ' upgrades' - printf "%s\n" ' --enable-profiler profiler support' printf "%s\n" ' --enable-rng-none dummy RNG, avoid using /dev/(u)random and' printf "%s\n" ' getrandom()' printf "%s\n" ' --enable-safe-stack SafeStack Stack Smash Protection (requires'
@@ -401,8 +400,6 @@ _meson_option_parse() { --with-pkgversion=*) quote_sh "-Dpkgversion=$2" ;; --enable-png) printf "%s" -Dpng=enabled ;; --disable-png) printf "%s" -Dpng=disabled ;; - --enable-profiler) printf "%s" -Dprofiler=true ;; - --disable-profiler) printf "%s" -Dprofiler=false ;; --enable-pvrdma) printf "%s" -Dpvrdma=enabled ;; --disable-pvrdma) printf "%s" -Dpvrdma=disabled ;; --enable-qcow1) printf "%s" -Dqcow1=enabled ;;
softmmu/runstate.c +0 -9
@@ -728,18 +728,9 @@ static bool main_loop_should_exit(int *status)int qemu_main_loop (void ) {int status =EXIT_SUCCESS ; -#ifdef CONFIG_PROFILER -int64_t ti; -#endif while (!main_loop_should_exit (&status)) { -#ifdef CONFIG_PROFILER - ti =profile_getclock (); -#endif main_loop_wait (false); -#ifdef CONFIG_PROFILER - dev_time +=profile_getclock () - ti; -#endif }return status;
tcg/tcg.c +0 -208
262 lines not on this page · raw message
tests/qtest/qmp-cmd-test.c +0 -3
@@ -46,9 +46,6 @@ static int query_error_class(const char *cmd) { "query-balloon", ERROR_CLASS_DEVICE_NOT_ACTIVE }, { "query-hotpluggable-cpus", ERROR_CLASS_GENERIC_ERROR }, { "query-vm-generation-id", ERROR_CLASS_GENERIC_ERROR }, -#ifndef CONFIG_PROFILER - { "x-query-profile", ERROR_CLASS_GENERIC_ERROR }, -#endif/* Only valid with a USB bus added */ { "x-query-usb", ERROR_CLASS_GENERIC_ERROR },/* Only valid with accel=tcg */
Signature · 1 line
2.25.1
Re: [PATCH v13 01/10] accel/tcg: remove CONFIG_PROFILER
Quoted 6 lines · Fei Wu
TBStats will be introduced to replace
CONFIG_PROFILERtotally, here remove allCONFIG_PROFILERrelated stuffs first.Signed-off-by Vanderson M. do Rosario<[email protected]>Signed-off-by Alex Bennée<[email protected]>Signed-off-by Fei Wu<[email protected]>
Quoted 13 lines
--- accel/tcg/monitor.c | 25 ---- accel/tcg/tcg-accel-ops.c | 10 -- accel/tcg/translate-all.c | 33 ------ include/qemu/timer.h | 9 -- include/tcg/tcg.h | 25 ---- meson.build | 2 - meson_options.txt | 2 - scripts/meson-buildoptions.sh | 3 - softmmu/runstate.c | 9 -- tcg/tcg.c | 208 ---------------------------------- tests/qtest/qmp-cmd-test.c | 3 - 11 files changed, 329 deletions(-)
r~
PATCH v13 2/10 accel/tcg: introduce TBStatistics structure
In reply to Fei WuFrom: "Vanderson M. do Rosario" <[email protected]>
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.
Message-Id: <[email protected]>
--- MAINTAINERS | 1 + accel/tcg/meson.build | 1 + accel/tcg/tb-context.h | 1 + accel/tcg/tb-hash.h | 7 +++++ accel/tcg/tb-maint.c | 19 ++++++++++++ accel/tcg/tb-stats.c | 58 +++++++++++++++++++++++++++++++++++ accel/tcg/translate-all.c | 43 ++++++++++++++++++++++++++ include/exec/exec-all.h | 3 ++ include/exec/tb-stats-flags.h | 21 +++++++++++++ include/exec/tb-stats.h | 56 +++++++++++++++++++++++++++++++++ 10 files changed, 210 insertions(+) create mode 100644 accel/tcg/tb-stats.c create mode 100644 include/exec/tb-stats-flags.h create mode 100644 include/exec/tb-stats.h
MAINTAINERS +1 -0
@@ -153,6 +153,7 @@ F: include/exec/cpu*.h F: include/exec/exec-all.h F: include/exec/tb-flush.h F: include/exec/target_long.h +F: include/exec/tb-stats*.h F: include/exec/helper*.h F: include/sysemu/cpus.h F: include/sysemu/tcg.h
accel/tcg/meson.build +1 -0
@@ -4,6 +4,7 @@ tcg_ss.add(files( 'cpu-exec-common.c', 'cpu-exec.c', 'tb-maint.c', + 'tb-stats.c', 'tcg-runtime-gvec.c', 'tcg-runtime.c', 'translate-all.c',
accel/tcg/tb-context.h +1 -0
@@ -35,6 +35,7 @@ struct TBContext {/* statistics */ unsigned tb_flush_count;unsigned tb_phys_invalidate_count; +struct qht tb_stats; };extern TBContext tb_ctx;
accel/tcg/tb-hash.h +7 -0
@@ -67,4 +67,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
accel/tcg/tb-maint.c +19 -0
@@ -24,6 +24,7 @@#include "exec/log.h" #include "exec/exec-all.h" #include "exec/tb-flush.h" +#include "exec/tb-stats.h" #include "exec/translate-all.h" #include "sysemu/tcg.h" #include "tcg/tcg.h"
@@ -41,6 +42,23 @@#define TB_FOR_EACH_JMP (head_tb, tb, n) \ TB_FOR_EACH_TAGGED((head_tb)->jmp_list_head, tb, n, jmp_list_next) +/* +* 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;
@@ -60,6 +78,7 @@ 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 (); }typedef struct PageDesc PageDesc ;
accel/tcg/tb-stats.c new file +58 -0
58 lines not on this page · raw message
accel/tcg/translate-all.c +43 -0
61 lines not on this page · raw message
include/exec/exec-all.h +3 -0
@@ -608,6 +608,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 */ +struct TBStatistics *tb_stats; };/* Hide the qatomic_read to make code a little easier on the eyes */
include/exec/tb-stats-flags.h new file +21 -0
@@ -0,0 +1,21 @@ +/* +* QEMU System Emulator, Code Quality Monitor System +* +* We define the flags and control bits here to avoid complications of +* including TCG/CPU information in common code. +* +* Copyright (c) 2019 Vanderson M. do Rosario <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0-or-later +*/ +#ifndef TB_STATS_FLAGS +#define TB_STATS_FLAGS + +/* TBStatistic collection controls */ +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
include/exec/tb-stats.h new file +56 -0
56 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v13 3/10 accel: collecting TB execution count
In reply to Fei WuFrom: "Vanderson M. do Rosario" <[email protected]>
If 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.
[Richard Henderson created the inline gen_tb_exec_count]
Message-Id: <[email protected]>
--- accel/tcg/cpu-exec.c | 6 ++++++ accel/tcg/tb-stats.c | 6 ++++++ accel/tcg/tcg-runtime.c | 1 + accel/tcg/translate-all.c | 7 +++++-- accel/tcg/translator.c | 25 +++++++++++++++++++++++++ include/exec/gen-icount.h | 1 + include/exec/tb-stats-flags.h | 5 +++++ include/exec/tb-stats.h | 13 +++++++++++++ 8 files changed, 62 insertions(+), 2 deletions(-)
accel/tcg/cpu-exec.c +6 -0
@@ -25,6 +25,7 @@#include "trace.h" #include "disas/disas.h" #include "exec/exec-all.h" +#include "exec/tb-stats.h" #include "tcg/tcg.h" #include "qemu/atomic.h" #include "qemu/rcu.h"
@@ -562,7 +563,12 @@ void cpu_exec_step_atomic(CPUState *cpu)mmap_unlock (); } +if (tb_stats_enabled (tb,TB_EXEC_STATS )) { + tb->tb_stats->executions.atomic++; + } +cpu_exec_enter (cpu); +/* execute the generated code */ trace_exec_tb (tb, pc);cpu_tb_exec (cpu, tb, &tb_exit);
accel/tcg/tb-stats.c +6 -0
@@ -22,6 +22,7 @@ enum TBStatsStatus { };static enum TBStatsStatus tcg_collect_tb_stats; +static uint32_t default_tbstats_flag;void init_tb_stats_htable (void ) {
@@ -56,3 +57,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 +1 -0
@@ -27,6 +27,7 @@#include "exec/helper-proto.h" #include "exec/cpu_ldst.h" #include "exec/exec-all.h" +#include "exec/tb-stats.h" #include "disas/disas.h" #include "exec/log.h" #include "tcg/tcg.h"
accel/tcg/translate-all.c +5 -2
@@ -295,6 +295,7 @@ static TBStatistics *tb_get_stats(tb_page_addr_t phys_pc, target_ulong pc, new_stats->pc = pc; new_stats->cs_base = cs_base; new_stats->flags = flags; + new_stats->stats_enabled =get_default_tbstats_flag ();/* * All initialisation must be complete before we insert into qht
@@ -382,9 +383,11 @@ TranslationBlock *tb_gen_code(CPUState *cpu,/* * We want to fetch the stats structure before we start code * generation so we can count interesting things about this -* generation. +* generation. If dfilter is in effect we will only collect stats +* for the specified range. */ -if (tb_stats_collection_enabled ()) { +if (tb_stats_collection_enabled () && +qemu_log_in_addr_range (tb->pc)) { tb->tb_stats =tb_get_stats (phys_pc, pc, cs_base, flags); }else { tb->tb_stats =NULL ;
accel/tcg/translator.c +25 -0
@@ -11,6 +11,7 @@#include "qemu/error-report.h" #include "tcg/tcg.h" #include "tcg/tcg-op.h" +#include "tcg/tcg-temp-internal.h" #include "exec/exec-all.h" #include "exec/gen-icount.h" #include "exec/log.h"
@@ -18,6 +19,29 @@#include "exec/plugin-gen.h" #include "exec/replay-core.h" +static void gen_tb_exec_count (TranslationBlock *tb) +{ +if (tb_stats_enabled (tb,TB_EXEC_STATS )) { +TCGv_ptr ptr =tcg_temp_ebb_new_ptr (); + +tcg_gen_movi_ptr (ptr, (intptr_t )&tb->tb_stats->executions.normal); +if (sizeof (tb->tb_stats->executions.normal) ==4 ) { +TCGv_i32 t =tcg_temp_ebb_new_i32 (); +tcg_gen_ld_i32 (t, ptr,0 ); +tcg_gen_addi_i32 (t, t,1 ); +tcg_gen_st_i32 (t, ptr,0 ); +tcg_temp_free_i32 (t); + }else { +TCGv_i64 t =tcg_temp_ebb_new_i64 (); +tcg_gen_ld_i64 (t, ptr,0 ); +tcg_gen_addi_i64 (t, t,1 ); +tcg_gen_st_i64 (t, ptr,0 ); +tcg_temp_free_i64 (t); + } +tcg_temp_free_ptr (ptr); + } +} +bool translator_use_goto_tb (DisasContextBase *db,target_ulong dest) {/* Suppress goto_tb if requested. */
@@ -56,6 +80,7 @@ void translator_loop(CPUState *cpu, TranslationBlock *tb, int *max_insns,/* Start translating. */ gen_tb_start (db->tb); +gen_tb_exec_count (tb); ops->tb_start (db, cpu);tcg_debug_assert (db->is_jmp ==DISAS_NEXT );/* no early exit */
include/exec/gen-icount.h +1 -0
@@ -2,6 +2,7 @@#define GEN_ICOUNT_H #include "exec/exec-all.h" +#include "exec/tb-stats.h" /* Helpers for instruction counting code generation. */
include/exec/tb-stats-flags.h +5 -0
@@ -11,6 +11,9 @@#ifndef TB_STATS_FLAGS #define TB_STATS_FLAGS +#define TB_NOTHING (1 << 0) +#define TB_EXEC_STATS (1 << 1) +/* TBStatistic collection controls */ void enable_collect_tb_stats (void );void disable_collect_tb_stats (void );
@@ -18,4 +21,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
include/exec/tb-stats.h +13 -0
@@ -31,6 +31,9 @@#include "exec/tb-stats-flags.h" #include "tcg/tcg.h" +#define tb_stats_enabled (tb,JIT_STATS ) \ + (tb && tb->tb_stats && (tb->tb_stats->stats_enabled & JIT_STATS)) +typedef struct TBStatistics TBStatistics ;/*
@@ -47,6 +50,16 @@ struct TBStatistics {uint32_t flags;/* cs_base isn't included in the hash but we do check for matches */ target_ulong cs_base; + +/* which stats are enabled for this TBStats */ +uint32_t stats_enabled; + +/* Execution stats */ +struct { +unsigned long normal; +unsigned long atomic; + } executions; + };bool tb_stats_cmp (const void *ap,const void *bp);
Signature · 1 line
2.25.1
PATCH v13 4/10 accel/tcg: add jit stats and time to TBStatistics
In reply to Fei WuThis collects all the statistics for TBStatistics, not only for the whole emulation but for each TB.
--- accel/tcg/monitor.c | 20 ++++- accel/tcg/tb-stats.c | 146 ++++++++++++++++++++++++++++++++++ accel/tcg/tcg-accel-ops.c | 7 ++ accel/tcg/translate-all.c | 76 +++++++++++++++++- accel/tcg/translator.c | 5 +- include/exec/tb-stats-flags.h | 2 + include/exec/tb-stats.h | 46 +++++++++++ include/qemu/timer.h | 6 ++ include/tcg/tcg.h | 45 ++++++++++- softmmu/runstate.c | 9 +++ tcg/tcg.c | 82 +++++++++++++++++-- tests/qtest/qmp-cmd-test.c | 3 + 12 files changed, 435 insertions(+), 12 deletions(-)
accel/tcg/monitor.c +19 -1
@@ -15,6 +15,7 @@#include "sysemu/cpus.h" #include "sysemu/cpu-timers.h" #include "sysemu/tcg.h" +#include "exec/tb-stats.h" #include "internal.h"
@@ -69,6 +70,11 @@ HumanReadableText *qmp_x_query_opcount(Error **errp) {g_autoptr (GString) buf =g_string_new ("" ); +if (!tb_stats_collection_enabled ()) { +error_setg (errp,"TB information not being recorded." ); +return NULL ; + } +if (!tcg_enabled ()) {error_setg (errp,"Opcode count information is only available with accel=tcg" );
@@ -80,11 +86,23 @@ HumanReadableText *qmp_x_query_opcount(Error **errp)return human_readable_text_from_str (buf); } +#ifdef CONFIG_TCG +HumanReadableText *qmp_x_query_profile (Error **errp) +{ +g_autoptr (GString) buf =g_string_new ("" ); + +dump_jit_exec_time_info (dev_time, buf); + dev_time =0 ; + +return human_readable_text_from_str (buf); +} +#else HumanReadableText *qmp_x_query_profile (Error **errp) { -error_setg (errp,"Internal profiler not compiled" ); +error_setg (errp,"TCG should be enabled!" );return NULL ; } +#endif static void hmp_tcg_register (void ) {
accel/tcg/tb-stats.c +146 -0
158 lines not on this page · raw message
accel/tcg/tcg-accel-ops.c +7 -0
@@ -70,10 +70,17 @@ void tcg_cpus_destroy(CPUState *cpu)int tcg_cpus_exec (CPUState *cpu) {int ret; +uint64_t ti; +assert (tcg_enabled ()); + ti =profile_getclock (); +cpu_exec_start (cpu); ret =cpu_exec (cpu);cpu_exec_end (cpu); + +qatomic_add (&tcg_ctx->prof.cpu_exec_time,profile_getclock () - ti); +return ret; }
accel/tcg/translate-all.c +73 -3
141 lines not on this page · raw message
accel/tcg/translator.c +4 -1
@@ -19,7 +19,7 @@#include "exec/plugin-gen.h" #include "exec/replay-core.h" -static void gen_tb_exec_count (TranslationBlock *tb) +static inline void gen_tb_exec_count (TranslationBlock *tb) {if (tb_stats_enabled (tb,TB_EXEC_STATS )) {TCGv_ptr ptr =tcg_temp_ebb_new_ptr ();
@@ -147,6 +147,9 @@ void translator_loop(CPUState *cpu, TranslationBlock *tb, int *max_insns, tb->size = db->pc_next - db->pc_first; tb->icount = db->num_insns; +/* Save number of guest instructions for TB_JIT_STATS */ + tcg_ctx->prof.translation.nb_guest_insns = db->num_insns; +if (qemu_loglevel_mask (CPU_LOG_TB_IN_ASM ) &&qemu_log_in_addr_range (db->pc_first)) {FILE *logfile =qemu_log_trylock ();
include/exec/tb-stats-flags.h +2 -0
@@ -13,6 +13,8 @@#define TB_NOTHING (1 << 0)#define TB_EXEC_STATS (1 << 1) +#define TB_JIT_STATS (1 << 2) +#define TB_JIT_TIME (1 << 3)/* TBStatistic collection controls */ void enable_collect_tb_stats (void );
include/exec/tb-stats.h +46 -0
62 lines not on this page · raw message
include/qemu/timer.h +6 -0
@@ -989,4 +989,10 @@ static inline int64_t cpu_get_host_ticks(void) }#endif +static inline int64_t profile_getclock (void ) +{ +return get_clock (); +} + +extern uint64_t dev_time;#endif
include/tcg/tcg.h +44 -1
69 lines not on this page · raw message
softmmu/runstate.c +9 -0
@@ -728,9 +728,18 @@ static bool main_loop_should_exit(int *status)int qemu_main_loop (void ) {int status =EXIT_SUCCESS ; +#ifdef CONFIG_TCG +uint64_t ti; +#endif while (!main_loop_should_exit (&status)) { +#ifdef CONFIG_TCG + ti =profile_getclock (); +#endif main_loop_wait (false); +#ifdef CONFIG_TCG + dev_time +=profile_getclock () - ti; +#endif }return status;
tcg/tcg.c +76 -6
155 lines not on this page · raw message
tests/qtest/qmp-cmd-test.c +3 -0
@@ -46,6 +46,9 @@ static int query_error_class(const char *cmd) { "query-balloon", ERROR_CLASS_DEVICE_NOT_ACTIVE }, { "query-hotpluggable-cpus", ERROR_CLASS_GENERIC_ERROR }, { "query-vm-generation-id", ERROR_CLASS_GENERIC_ERROR }, +#ifndef CONFIG_TCG + { "x-query-profile", ERROR_CLASS_GENERIC_ERROR }, +#endif /* Only valid with a USB bus added */ { "x-query-usb", ERROR_CLASS_GENERIC_ERROR }, /* Only valid with accel=tcg */
Signature · 1 line
2.25.1
Re: [PATCH v13 04/10] accel/tcg: add jit stats and time to TBStatistics
Quoted 30 lines · Fei Wu
include/tcg/tcg.h +30
-0+/* +* The TCGProfile structure holds data for analysing the quality of +* the code generation. The data is split between stuff that is valid +* for the lifetime of a single translation and things that are valid +* for the lifetime of the translator. As the former is reset for each +* new translation so it should be copied elsewhere if you want to +* keep it. +* +* The structure is safe to access within the context of translation +* but accessing the data from elsewhere should be done with safe +* work. +*/ +typedef struct TCGProfile { + + struct { + int nb_guest_insns; + int nb_spills; + int nb_ops_pre_opt; + + int del_op_count; + int temp_count; + } translation; + + int64_t cpu_exec_time; + int64_t op_count; /* total insn count */ + int64_t code_in_len; + int64_t code_out_len; + int64_t search_out_len; + + /* Timestamps during translation */
include/tcg/tcg.h static inline TCGRegSet output_pref(const TCGOp *op, unsigned i) · line 564
Quoted 10 lines
include/tcg/tcg.h +10
-0+uint64_t gen_start_time; +uint64_t gen_ir_done_time; +uint64_t gen_opt_done_time; +uint64_t gen_la_done_time; +uint64_t gen_code_done_time; + +/* Lifetime count of TCGOps per TCGContext */ +uint64_t table_op_count[NB_OPS ]; +} TCGProfile; +
Why have you added this back?
The whole point of removing CONFIG_PROFILE to begin was to have all new code. Not to remove it then reintroduce it unchanged.
In tcg_gen_code, you have access to the TranslationBlock as s->gen_tb. There is zero point to accumulating into TCGProfile, when you could be accumulating into TCGStatistics directly.
r~
Re: [PATCH v13 04/10] accel/tcg: add jit stats and time to TBStatistics
Quoted 44 lines · Richard Henderson
Quoted 30 lines · Fei Wu
include/tcg/tcg.h +30
-0+/* +* The TCGProfile structure holds data for analysing the quality of +* the code generation. The data is split between stuff that is valid +* for the lifetime of a single translation and things that are valid +* for the lifetime of the translator. As the former is reset for each +* new translation so it should be copied elsewhere if you want to +* keep it. +* +* The structure is safe to access within the context of translation +* but accessing the data from elsewhere should be done with safe +* work. +*/ +typedef struct TCGProfile { + + struct { + int nb_guest_insns; + int nb_spills; + int nb_ops_pre_opt; + + int del_op_count; + int temp_count; + } translation; + + int64_t cpu_exec_time; + int64_t op_count; /* total insn count */ + int64_t code_in_len; + int64_t code_out_len; + int64_t search_out_len; + + /* Timestamps during translation */include/tcg/tcg.h static inline TCGRegSet output_pref(const TCGOp *op, unsigned i) · line 564
Quoted 10 lines
include/tcg/tcg.h +10
-0+ uint64_t gen_start_time; + uint64_t gen_ir_done_time; + uint64_t gen_opt_done_time; + uint64_t gen_la_done_time; + uint64_t gen_code_done_time; + + /* Lifetime count of TCGOps per TCGContext */ + uint64_t table_op_count[NB_OPS]; +} TCGProfile; +Why have you added this back?
Quoted 7 lines
The whole point of removing
CONFIG_PROFILEto begin was to have all new code. Not to remove it then reintroduce it unchanged.In
tcg_gen_code, you have access to the TranslationBlock ass->gen_tb. There is zero point to accumulating into TCGProfile, when you could be accumulating into TCGStatistics directly.
TCGProfile contains global wide (per TCGContext) stats, but TBStatistics is TB specific, some info in TCGProfile such as table_op_count is not able to be summed up from TBStatistics. The per-translation stats in TCGProfile may be removed indeed.
Thanks,
Fei.
Quoted 2 lines
r~
Re: [PATCH v13 04/10] accel/tcg: add jit stats and time to TBStatistics
Quoted 48 lines · Fei
Quoted 47 lines · Richard Henderson
Quoted 30 lines · Fei Wu
include/tcg/tcg.h +30
-0+/* +* The TCGProfile structure holds data for analysing the quality of +* the code generation. The data is split between stuff that is valid +* for the lifetime of a single translation and things that are valid +* for the lifetime of the translator. As the former is reset for each +* new translation so it should be copied elsewhere if you want to +* keep it. +* +* The structure is safe to access within the context of translation +* but accessing the data from elsewhere should be done with safe +* work. +*/ +typedef struct TCGProfile { + + struct { + int nb_guest_insns; + int nb_spills; + int nb_ops_pre_opt; + + int del_op_count; + int temp_count; + } translation; + + int64_t cpu_exec_time; + int64_t op_count; /* total insn count */ + int64_t code_in_len; + int64_t code_out_len; + int64_t search_out_len; + + /* Timestamps during translation */include/tcg/tcg.h static inline TCGRegSet output_pref(const TCGOp *op, unsigned i) · line 564
Quoted 10 lines
include/tcg/tcg.h +10
-0+ uint64_t gen_start_time; + uint64_t gen_ir_done_time; + uint64_t gen_opt_done_time; + uint64_t gen_la_done_time; + uint64_t gen_code_done_time; + + /* Lifetime count of TCGOps per TCGContext */ + uint64_t table_op_count[NB_OPS]; +} TCGProfile; +Why have you added this back?
The whole point of removing
CONFIG_PROFILEto begin was to have all new code. Not to remove it then reintroduce it unchanged.
Quoted 9 lines
Quoted 4 lines
In
tcg_gen_code, you have access to the TranslationBlock ass->gen_tb. There is zero point to accumulating into TCGProfile, when you could be accumulating into TCGStatistics directly.TCGProfile contains global wide (per TCGContext) stats, but TBStatistics is TB specific, some info in TCGProfile such as
table_op_countis not able to be summed up from TBStatistics. The per-translation stats in TCGProfile may be removed indeed.
After some cleanup locally, these are the remains in TCGProfile:
* cpu_exec_time - which is not guarded by tb_stats_enabled, it could be moved out as an individual variable?
* gen_xxx_time - which in kinda global variables across functions to calc ts->gen_times
* table_op_count - it's indeed guarded by tb_stats_enabled, but it's a large array, it might be too large to put into TBStaticstics.
Thanks,
Fei.
Quoted 6 lines
Thanks,
Fei.Quoted 2 lines
r~
Re: [PATCH v13 04/10] accel/tcg: add jit stats and time to TBStatistics
Quoted 15 lines · Fei
Quoted 14 lines · Fei
Quoted 13 lines · Richard Henderson
Quoted 12 lines · Fei Wu
+/*
+ * The TCGProfile structure holds data for analysing the quality of
+ * the code generation. The data is split between stuff that is valid
+ * for the lifetime of a single translation and things that are valid
+ * for the lifetime of the translator. As the former is reset for each
+ * new translation so it should be copied elsewhere if you want to
+ * keep it.
+ *
+ * The structure is safe to access within the context of translation
+ * but accessing the data from elsewhere should be done with safe
+ * work.
+ */
<snip>
Quoted 32 lines
Quoted 23 lines
Quoted 23 lines
Quoted 7 lines
+
int64_tcpu_exec_time;
+int64_top_count; /* total insn count */
+int64_tcode_in_len;
+int64_tcode_out_len;
+int64_tsearch_out_len;include/tcg/tcg.h +2
-0+ + /* Timestamps during translation */include/tcg/tcg.h static inline TCGRegSet output_pref(const TCGOp *op, unsigned i) · line 564
Quoted 10 lines
include/tcg/tcg.h +10
-0+ uint64_t gen_start_time; + uint64_t gen_ir_done_time; + uint64_t gen_opt_done_time; + uint64_t gen_la_done_time; + uint64_t gen_code_done_time; + + /* Lifetime count of TCGOps per TCGContext */ + uint64_t table_op_count[NB_OPS]; +} TCGProfile; +Why have you added this back?
The whole point of removing
CONFIG_PROFILEto begin was to have all new code. Not to remove it then reintroduce it unchanged.Quoted 9 lines
Quoted 4 lines
In
tcg_gen_code, you have access to the TranslationBlock ass->gen_tb. There is zero point to accumulating into TCGProfile, when you could be accumulating into TCGStatistics directly.TCGProfile contains global wide (per TCGContext) stats, but TBStatistics is TB specific, some info in TCGProfile such as
table_op_countis not able to be summed up from TBStatistics. The per-translation stats in TCGProfile may be removed indeed.
Quoted 5 lines
After some cleanup locally, these are the remains in TCGProfile:
*cpu_exec_time- which is not guarded bytb_stats_enabled, it could be moved out as an individual variable?
*gen_xxx_time- which in kinda global variables across functions to calcts->gen_times
Given the work on JIT profiling I think there is an argument to drop the time profile bits and pieces. I think you can get the same information from a perf run although it does amortise the cost of generation over all translations. Do we see any particular TBs that are particularly expensive to translate by more than a standard deviation?
Quoted 2 lines
*
table_op_count- it's indeed guarded bytb_stats_enabled, but it's a large array, it might be too large to put into TBStaticstics.
Probably. This is probably more interesting information as an aggregate than per TB.
Quoted 10 lines
Thanks,
Fei.Quoted 6 lines
Thanks,
Fei.Quoted 2 lines
r~
Signature · 2 lines
Alex Bennée Virtualisation Tech Lead @ Linaro
Re: [PATCH v13 04/10] accel/tcg: add jit stats and time to TBStatistics
Quoted 57 lines · Alex Bennée
Quoted 15 lines · Fei
Quoted 14 lines · Fei
Quoted 13 lines · Richard Henderson
Quoted 12 lines · Fei Wu
+/*
+ * The TCGProfile structure holds data for analysing the quality of
+ * the code generation. The data is split between stuff that is valid
+ * for the lifetime of a single translation and things that are valid
+ * for the lifetime of the translator. As the former is reset for each
+ * new translation so it should be copied elsewhere if you want to
+ * keep it.
+ *
+ * The structure is safe to access within the context of translation
+ * but accessing the data from elsewhere should be done with safe
+ * work.
+ */<snip>
Quoted 32 lines
Quoted 23 lines
Quoted 23 lines
Quoted 7 lines
+
int64_tcpu_exec_time;
+int64_top_count; /* total insn count */
+int64_tcode_in_len;
+int64_tcode_out_len;
+int64_tsearch_out_len;include/tcg/tcg.h +2
-0+ + /* Timestamps during translation */include/tcg/tcg.h static inline TCGRegSet output_pref(const TCGOp *op, unsigned i) · line 564
Quoted 10 lines
include/tcg/tcg.h +10
-0+ uint64_t gen_start_time; + uint64_t gen_ir_done_time; + uint64_t gen_opt_done_time; + uint64_t gen_la_done_time; + uint64_t gen_code_done_time; + + /* Lifetime count of TCGOps per TCGContext */ + uint64_t table_op_count[NB_OPS]; +} TCGProfile; +Why have you added this back?
The whole point of removing
CONFIG_PROFILEto begin was to have all new code. Not to remove it then reintroduce it unchanged.Quoted 9 lines
Quoted 4 lines
In
tcg_gen_code, you have access to the TranslationBlock ass->gen_tb. There is zero point to accumulating into TCGProfile, when you could be accumulating into TCGStatistics directly.TCGProfile contains global wide (per TCGContext) stats, but TBStatistics is TB specific, some info in TCGProfile such as
table_op_countis not able to be summed up from TBStatistics. The per-translation stats in TCGProfile may be removed indeed.Quoted 5 lines
After some cleanup locally, these are the remains in TCGProfile:
*cpu_exec_time- which is not guarded bytb_stats_enabled, it could be moved out as an individual variable?
*gen_xxx_time- which in kinda global variables across functions to calcts->gen_times
Quoted 6 lines
Given the work on JIT profiling I think there is an argument to drop the time profile bits and pieces. I think you can get the same information from a perf run although it does amortise the cost of generation over all translations. Do we see any particular TBs that are particularly expensive to translate by more than a standard deviation?
I haven't seen this before, but it may be different if we sort the TBs by these times. Perhaps we can get some idea of some kinds of code takes more time to optimize than others?
Quoted 6 lines
Quoted 2 lines
*
table_op_count- it's indeed guarded bytb_stats_enabled, but it's a large array, it might be too large to put into TBStaticstics.Probably. This is probably more interesting information as an aggregate than per TB.
Yes, I kept this here in v14.
Thanks,
Fei.
Quoted 12 lines
Quoted 10 lines
Thanks,
Fei.Quoted 6 lines
Thanks,
Fei.Quoted 2 lines
r~
Re: [PATCH v13 04/10] accel/tcg: add jit stats and time to TBStatistics
In reply to Alex BennéeQuoted 57 lines · Alex Bennée
Quoted 15 lines · Fei
Quoted 14 lines · Fei
Quoted 13 lines · Richard Henderson
Quoted 12 lines · Fei Wu
+/*
+ * The TCGProfile structure holds data for analysing the quality of
+ * the code generation. The data is split between stuff that is valid
+ * for the lifetime of a single translation and things that are valid
+ * for the lifetime of the translator. As the former is reset for each
+ * new translation so it should be copied elsewhere if you want to
+ * keep it.
+ *
+ * The structure is safe to access within the context of translation
+ * but accessing the data from elsewhere should be done with safe
+ * work.
+ */<snip>
Quoted 32 lines
Quoted 23 lines
Quoted 23 lines
Quoted 7 lines
+
int64_tcpu_exec_time;
+int64_top_count; /* total insn count */
+int64_tcode_in_len;
+int64_tcode_out_len;
+int64_tsearch_out_len;include/tcg/tcg.h +2
-0+ + /* Timestamps during translation */include/tcg/tcg.h static inline TCGRegSet output_pref(const TCGOp *op, unsigned i) · line 564
Quoted 10 lines
include/tcg/tcg.h +10
-0+ uint64_t gen_start_time; + uint64_t gen_ir_done_time; + uint64_t gen_opt_done_time; + uint64_t gen_la_done_time; + uint64_t gen_code_done_time; + + /* Lifetime count of TCGOps per TCGContext */ + uint64_t table_op_count[NB_OPS]; +} TCGProfile; +Why have you added this back?
The whole point of removing
CONFIG_PROFILEto begin was to have all new code. Not to remove it then reintroduce it unchanged.Quoted 9 lines
Quoted 4 lines
In
tcg_gen_code, you have access to the TranslationBlock ass->gen_tb. There is zero point to accumulating into TCGProfile, when you could be accumulating into TCGStatistics directly.TCGProfile contains global wide (per TCGContext) stats, but TBStatistics is TB specific, some info in TCGProfile such as
table_op_countis not able to be summed up from TBStatistics. The per-translation stats in TCGProfile may be removed indeed.Quoted 5 lines
After some cleanup locally, these are the remains in TCGProfile:
*cpu_exec_time- which is not guarded bytb_stats_enabled, it could be moved out as an individual variable?
*gen_xxx_time- which in kinda global variables across functions to calcts->gen_times
Quoted 6 lines
Given the work on JIT profiling I think there is an argument to drop the time profile bits and pieces. I think you can get the same information from a perf run although it does amortise the cost of generation over all translations. Do we see any particular TBs that are particularly expensive to translate by more than a standard deviation?
I added some code locally to sort by ir/code, (opt & la are not printed in 'info tb-list').
(qemu) info tb-list 2 ir
(qemu) TB id:1 | phys:0x2abe14 virt:0xffffffff800abe14 flags:0x01024001 0 inv/1
| exec:99079/0 guest inst cov:0.03%
| trans:1 ints: g:6 op:24 op_opt:21 spills:0
| h/g (host bytes / guest insts): 20.000000
| time to gen at 2.4GHz => code:840.00(ns) IR:75274.58(ns)TB id:2 | phys:0x24cf94 virt:0xffffffff8004cf94 flags:0x01024001 0 inv/3
| exec:99085/0 guest inst cov:0.53%
| trans:3 ints: g:31 op:86 op_opt:74 spills:0
| h/g (host bytes / guest insts): 42.322582
| time to gen at 2.4GHz => code:10011.25(ns) IR:118656.25(ns)(qemu) info tb-list 2 ir
(qemu) TB id:1 | phys:0x24cf94 virt:0xffffffff8004cf94 flags:0x01024001 0 inv/3
| exec:131259/0 guest inst cov:0.59%
| trans:3 ints: g:31 op:86 op_opt:74 spills:0
| h/g (host bytes / guest insts): 42.322582
| time to gen at 2.4GHz => code:10011.25(ns) IR:118656.25(ns)TB id:2 | phys:0x2abe14 virt:0xffffffff800abe14 flags:0x01024001 1 inv/3
| exec:131541/0 guest inst cov:0.11%
| trans:3 ints: g:6 op:24 op_opt:21 spills:0
| h/g (host bytes / guest insts): 20.000000
| time to gen at 2.4GHz => code:4411.25(ns) IR:88288.33(ns)(qemu) info tb 2
(qemu)
------------------------------
TB id:2 | phys:0x2abe14 virt:0xffffffff800abe14 flags:0x01024001 1 inv/3
| exec:668754/0 guest inst cov:0.16%
| trans:3 ints: g:6 op:24 op_opt:21 spills:0
| h/g (host bytes / guest insts): 20.000000
| time to gen at 2.4GHz => code:4411.25(ns) IR:88288.33(ns)----------------
IN:
Priv: 1; Virt: 0
0xffffffff800abe14: 864a mv a2,s2
0xffffffff800abe16: 85ce mv a1,s3
0xffffffff800abe18: 8526 mv a0,s1
0xffffffff800abe1a: 46bd addi a3,zero,15
0xffffffff800abe1c: fffff097 auipc ra,-4096
# 0xffffffff800aae1c0xffffffff800abe20: cc0080e7 jalr ra,ra,-832
------------------------------
Look at the tb with phys:0x2abe14, although the first time IR takes 75274ns, but in the second command we can see it takes much less time (Note IR time is accumulated).
So if the time for the same TB is not consistent, and the deviation could be dominated by system events such as memory allocation instead of codegen itself (?), I think it's less useful.
Alex, regarding dropping time profile, do you mean remove TB_JIT_TIME completely?
Thanks,
Fei.
Quoted 18 lines
Quoted 2 lines
*
table_op_count- it's indeed guarded bytb_stats_enabled, but it's a large array, it might be too large to put into TBStaticstics.Probably. This is probably more interesting information as an aggregate than per TB.
Quoted 10 lines
Thanks,
Fei.Quoted 6 lines
Thanks,
Fei.Quoted 2 lines
r~
Re: [PATCH v13 04/10] accel/tcg: add jit stats and time to TBStatistics
Quoted 7 lines · Fei
Quoted 6 lines · Alex Bennée
Quoted 3 lines · Fei
Quoted 2 lines · Fei
Quoted 1 line · Richard Henderson
On 5/29/23 04:49, Fei Wu wrote:
<snip>
Quoted 17 lines
----------------
IN:
Priv: 1; Virt: 00xffffffff800abe14: 864a mv a2,s2 0xffffffff800abe16: 85ce mv a1,s3 0xffffffff800abe18: 8526 mv a0,s1 0xffffffff800abe1a: 46bd addi a3,zero,15 0xffffffff800abe1c: fffff097 auipc ra,-4096 # 0xffffffff800aae1c
0xffffffff800abe20:cc0080e7jalr ra,ra,-832
------------------------------Look at the tb with phys:0x2abe14, although the first time IR takes 75274ns, but in the second command we can see it takes much less time (Note IR time is accumulated).
Quoted 6 lines
So if the time for the same TB is not consistent, and the deviation could be dominated by system events such as memory allocation instead of codegen itself (?), I think it's less useful.
Alex, regarding dropping time profile, do you mean remove
TB_JIT_TIMEcompletely?
I think so - perf would do a better job of separating system events from the core code as it has better visibility of the whole system.
Signature · 2 lines
Alex Bennée Virtualisation Tech Lead @ Linaro
Re: [PATCH v13 04/10] accel/tcg: add jit stats and time to TBStatistics
Quoted 32 lines · Alex Bennée
Quoted 7 lines · Fei
Quoted 6 lines · Alex Bennée
Quoted 3 lines · Fei
Quoted 2 lines · Fei
Quoted 1 line · Richard Henderson
On 5/29/23 04:49, Fei Wu wrote:
<snip>
Quoted 21 lines
----------------
IN:
Priv: 1; Virt: 00xffffffff800abe14: 864a mv a2,s2 0xffffffff800abe16: 85ce mv a1,s3 0xffffffff800abe18: 8526 mv a0,s1 0xffffffff800abe1a: 46bd addi a3,zero,15 0xffffffff800abe1c: fffff097 auipc ra,-4096 # 0xffffffff800aae1c
0xffffffff800abe20:cc0080e7jalr ra,ra,-832
------------------------------Look at the tb with phys:0x2abe14, although the first time IR takes 75274ns, but in the second command we can see it takes much less time (Note IR time is accumulated).
So if the time for the same TB is not consistent, and the deviation could be dominated by system events such as memory allocation instead of codegen itself (?), I think it's less useful.
Quoted 6 lines
Quoted 2 lines
Alex, regarding dropping time profile, do you mean remove
TB_JIT_TIMEcompletely?I think so - perf would do a better job of separating system events from the core code as it has better visibility of the whole system.
OK, got it.
Richard, can we reach the agreement here? If yes, I will remove TB_JIT_TIME and all the time stuffs (dev_time, cpu_exec_time) completely. We can still add it back if it proves to be useful. The only concern is that tbstats replaces CONFIG_PROFILER but drops this function from it.
Thanks,
Fei.
Re: [PATCH v13 04/10] accel/tcg: add jit stats and time to TBStatistics
Quoted 39 lines · Fei
Quoted 32 lines · Alex Bennée
Quoted 7 lines · Fei
Quoted 6 lines · Alex Bennée
Quoted 3 lines · Fei
Quoted 2 lines · Fei
Quoted 1 line · Richard Henderson
On 5/29/23 04:49, Fei Wu wrote:
<snip>
Quoted 21 lines
----------------
IN:
Priv: 1; Virt: 00xffffffff800abe14: 864a mv a2,s2 0xffffffff800abe16: 85ce mv a1,s3 0xffffffff800abe18: 8526 mv a0,s1 0xffffffff800abe1a: 46bd addi a3,zero,15 0xffffffff800abe1c: fffff097 auipc ra,-4096 # 0xffffffff800aae1c
0xffffffff800abe20:cc0080e7jalr ra,ra,-832
------------------------------Look at the tb with phys:0x2abe14, although the first time IR takes 75274ns, but in the second command we can see it takes much less time (Note IR time is accumulated).
So if the time for the same TB is not consistent, and the deviation could be dominated by system events such as memory allocation instead of codegen itself (?), I think it's less useful.
Quoted 6 lines
Quoted 2 lines
Alex, regarding dropping time profile, do you mean remove
TB_JIT_TIMEcompletely?I think so - perf would do a better job of separating system events from the core code as it has better visibility of the whole system.
Quoted 7 lines
OK, got it.
Richard, can we reach the agreement here? If yes, I will remove
TB_JIT_TIMEand all the time stuffs (dev_time,cpu_exec_time) completely. We can still add it back if it proves to be useful. The only concern is that tbstats replacesCONFIG_PROFILERbut drops this function from it.
Yes, I'm quite happy to drop all of the time stuff.
r~
PATCH v13 5/10 debug: add -d tb_stats to control TBStatistics collection:
In reply to Fei WuFrom: "Vanderson M. do Rosario" <[email protected]>
-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
...
Message-Id: <[email protected]>
--- accel/tcg/tb-stats.c | 5 +++++ include/exec/gen-icount.h | 1 + include/exec/tb-stats-flags.h | 3 +++ include/exec/tb-stats.h | 2 ++ include/qemu/log.h | 1 + stubs/meson.build | 1 + stubs/tb-stats.c | 27 +++++++++++++++++++++++++ util/log.c | 37 +++++++++++++++++++++++++++++++++++ 8 files changed, 77 insertions(+) create mode 100644 stubs/tb-stats.c
accel/tcg/tb-stats.c +5 -0
@@ -208,3 +208,8 @@ uint32_t get_default_tbstats_flag(void) {return default_tbstats_flag; } + +void set_default_tbstats_flag (uint32_t flags) +{ + default_tbstats_flag = flags; +}
include/exec/gen-icount.h +1 -0
@@ -3,6 +3,7 @@#include "exec/exec-all.h" #include "exec/tb-stats.h" +#include "tb-stats-flags.h" /* Helpers for instruction counting code generation. */
include/exec/tb-stats-flags.h +3 -0
@@ -15,6 +15,7 @@#define TB_EXEC_STATS (1 << 1)#define TB_JIT_STATS (1 << 2)#define TB_JIT_TIME (1 << 3) +#define TB_ALL_STATS (TB_EXEC_STATS | TB_JIT_STATS | TB_JIT_TIME)/* TBStatistic collection controls */ void enable_collect_tb_stats (void );
@@ -24,5 +25,7 @@ bool tb_stats_collection_enabled(void);bool tb_stats_collection_paused (void );uint32_t get_default_tbstats_flag (void ); +void set_default_tbstats_flag (uint32_t ); +void set_tbstats_flags (uint32_t flags);#endif
include/exec/tb-stats.h +2 -0
@@ -31,6 +31,8 @@#include "exec/tb-stats-flags.h" #include "tcg/tcg.h" +#include "exec/tb-stats-flags.h" +#define tb_stats_enabled (tb,JIT_STATS ) \ (tb && tb->tb_stats && (tb->tb_stats->stats_enabled & JIT_STATS))
include/qemu/log.h +1 -0
@@ -35,6 +35,7 @@ bool qemu_log_separate(void);/* LOG_STRACE is used for user-mode strace logging. */ #define LOG_STRACE (1 << 19)#define LOG_PER_THREAD (1 << 20) +#define CPU_LOG_TB_STATS (1 << 21)/* Lock/unlock output. */
stubs/meson.build +1 -0
@@ -65,3 +65,4 @@ else endif stub_ss.add(files('semihost-all.c')) stub_ss.add(when: 'CONFIG_VFIO_USER_SERVER', if_false: files('vfio-user-obj.c')) +stub_ss.add(files('tb-stats.c'))
stubs/tb-stats.c new file +27 -0
@@ -0,0 +1,27 @@ +/* +* TB Stats Stubs +* +* Copyright (c) 2019 +* Written by Alex Bennée <[email protected]> +* +* This code is licensed under the GNU GPL v2, or later. +*/ + + +#include "qemu/osdep.h" +#include "exec/tb-stats-flags.h" + +void enable_collect_tb_stats (void ) +{ +return ; +} + +bool tb_stats_collection_enabled (void ) +{ +return false; +} + +void set_default_tbstats_flag (uint32_t flags) +{ +return ; +}
util/log.c +37 -0
@@ -19,6 +19,7 @@#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"
@@ -27,6 +28,7 @@#include "qemu/thread.h" #include "qemu/lockable.h" #include "qemu/rcu.h" +#include "exec/tb-stats-flags.h" #ifdef CONFIG_LINUX #include <sys/syscall.h> #endif
@@ -47,6 +49,7 @@ static __thread Notifier qemu_log_thread_cleanup_notifier;int qemu_loglevel;static bool log_per_thread;static GArray *debug_regions; +int32_t max_num_hot_tbs_to_dump;/* Returns true if qemu_log() will really write somewhere. */ bool qemu_log_enabled (void )
@@ -495,6 +498,10 @@ const QEMULogItem qemu_log_items[] = { "log every user-mode syscall, its input, and its result" }, {LOG_PER_THREAD ,"tid" , "open a separate log file per thread; filename must contain '%d'" }, + { 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 }, };
@@ -516,6 +523,36 @@ 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 ; +set_default_tbstats_flag (TB_ALL_STATS ); +enable_collect_tb_stats (); + }else if (tb_stats_collection_enabled () && +g_str_has_prefix (*tmp,"dump_limit=" )) { + max_num_hot_tbs_to_dump =atoi ((*tmp) +11 ); + }else if (tb_stats_collection_enabled () && +g_str_has_prefix (*tmp,"level=" )) { +uint32_t flags =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" )) { + flags |=TB_JIT_STATS ; + }else if (g_str_equal (*level_tmp,"exec" )) { + flags |=TB_EXEC_STATS ; + }else if (g_str_equal (*level_tmp,"time" )) { + flags |=TB_JIT_TIME ; + }else if (g_str_equal (*level_tmp,"all" )) { + flags |=TB_ALL_STATS ; + }else { +/* FIXME: set errp */ +fprintf (stderr,"no option level=%s, valid options are:" +"all, jit, exec or/and time\n" , *level_tmp); +exit (1 ); + } +set_default_tbstats_flag (flags); + } }else {for (item = qemu_log_items; item->mask !=0 ; item++) {if (g_str_equal (*tmp, item->name)) {
Signature · 1 line
2.25.1
PATCH v13 6/10 monitor: adding tb_stats hmp command
In reply to Fei WuFrom: "Vanderson M. do Rosario" <[email protected]>
Adding 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.
Message-Id: <[email protected]>
Message-Id: <[email protected]>
--- accel/tcg/monitor.c | 45 +++++++++++++ accel/tcg/tb-stats.c | 121 +++++++++++++++++++++++++++++++++- hmp-commands.hx | 16 +++++ include/exec/tb-stats-flags.h | 2 + include/exec/tb-stats.h | 10 +++ include/monitor/hmp.h | 1 + 6 files changed, 192 insertions(+), 3 deletions(-)
accel/tcg/monitor.c +45 -0
@@ -11,7 +11,9 @@#include "qapi/error.h" #include "qapi/type-helpers.h" #include "qapi/qapi-commands-machine.h" +#include "qapi/qmp/qdict.h" #include "monitor/monitor.h" +#include "monitor/hmp.h" #include "sysemu/cpus.h" #include "sysemu/cpu-timers.h" #include "sysemu/tcg.h"
@@ -87,6 +89,49 @@ HumanReadableText *qmp_x_query_opcount(Error **errp) }#ifdef CONFIG_TCG +void hmp_tbstats (Monitor *mon,const QDict *qdict) +{ +if (!tcg_enabled ()) { +error_report ("TB information is only available with accel=tcg" ); +return ; + } + +char *cmd = (char *)qdict_get_try_str (qdict,"command" ); +enum TbstatsCmd icmd =-1 ; + +if (strcmp (cmd,"start" ) ==0 ) { + icmd =START ; + }else if (strcmp (cmd,"pause" ) ==0 ) { + icmd =PAUSE ; + }else if (strcmp (cmd,"stop" ) ==0 ) { + icmd =STOP ; + }else if (strcmp (cmd,"filter" ) ==0 ) { + icmd =FILTER ; + }else { +error_report ("invalid command!" ); +return ; + } + +char *slevel = (char *)qdict_get_try_str (qdict,"level" ); +uint32_t level =TB_EXEC_STATS |TB_JIT_STATS |TB_JIT_TIME ; +if (slevel) { +if (strcmp (slevel,"jit" ) ==0 ) { + level =TB_JIT_STATS ; + }else if (strcmp (slevel,"exec" ) ==0 ) { + level =TB_EXEC_STATS ; + }else if (strcmp (slevel,"time" ) ==0 ) { + level =TB_JIT_TIME ; + } + } + + struct TbstatsCommand *tbscommand = g_new0(struct TbstatsCommand, 1); + tbscommand->cmd = icmd; + tbscommand->level = level; +async_safe_run_on_cpu (first_cpu, do_hmp_tbstats_safe, +RUN_ON_CPU_HOST_PTR (tbscommand)); + +} +HumanReadableText *qmp_x_query_profile (Error **errp) {g_autoptr (GString) buf =g_string_new ("" );
accel/tcg/tb-stats.c +118 -3
160 lines not on this page · raw message
hmp-commands.hx +16 -0
@@ -1670,6 +1670,22 @@ SRST Executes a qemu-io command on the given block device. ERST +#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 + +SRST +``tb_stats`` *command* *stats_level* + Control recording tb statistics +ERST + { .name = "qom-list", .args_type = "path:s?",
include/exec/tb-stats-flags.h +2 -0
@@ -16,12 +16,14 @@#define TB_JIT_STATS (1 << 2)#define TB_JIT_TIME (1 << 3)#define TB_ALL_STATS (TB_EXEC_STATS | TB_JIT_STATS | TB_JIT_TIME) +#define TB_PAUSED (1 << 4)/* TBStatistic collection controls */ 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_disabled (void );bool tb_stats_collection_paused (void );uint32_t get_default_tbstats_flag (void );
include/exec/tb-stats.h +10 -0
@@ -33,6 +33,9 @@#include "exec/tb-stats-flags.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))
@@ -114,4 +117,11 @@ void init_tb_stats_htable(void);void dump_jit_profile_info (TCGProfile *s,GString *buf);void dump_jit_exec_time_info (uint64_t dev_time,GString *buf); +struct TbstatsCommand { +enum TbstatsCmd cmd; +uint32_t level; +}; + +void do_hmp_tbstats_safe (CPUState *cpu,run_on_cpu_data icmd); +#endif
include/monitor/hmp.h +1 -0
@@ -181,5 +181,6 @@ void hmp_ioport_write(Monitor *mon, const QDict *qdict);void hmp_boot_set (Monitor *mon,const QDict *qdict);void hmp_info_mtree (Monitor *mon,const QDict *qdict);void hmp_info_cryptodev (Monitor *mon,const QDict *qdict); +void hmp_tbstats (Monitor *mon,const QDict *qdict);#endif
Signature · 1 line
2.25.1
PATCH v13 7/10 tb-stats: reset the tracked TBs on a tb_flush
In reply to Fei WuFrom: Alex Bennée <[email protected]>
We keep track of translations but can only do so up until the translation cache is flushed. At that point we really have no idea if we can re-create a translation because all the active tracking information has been reset.
--- accel/tcg/tb-maint.c | 1 + accel/tcg/tb-stats.c | 19 +++++++++++++++++++ include/exec/tb-stats.h | 8 ++++++++ 3 files changed, 28 insertions(+)
accel/tcg/tb-maint.c +1 -0
@@ -763,6 +763,7 @@ static void do_tb_flush(CPUState *cpu, run_on_cpu_data tb_flush_count)qht_reset_size (&tb_ctx.htable,CODE_GEN_HTABLE_SIZE );tb_remove_all (); +tbstats_reset_tbs ();tcg_region_reset_all ();/* XXX: flush processor icache at this point if cache flush is expensive */ qatomic_inc (&tb_ctx.tb_flush_count);
accel/tcg/tb-stats.c +19 -0
@@ -267,6 +267,25 @@ void do_hmp_tbstats_safe(CPUState *cpu, run_on_cpu_data icmd)g_free (cmdinfo); } +/* +* We have to reset the tbs array on a tb_flush as those +* TranslationBlocks no longer exist and we no loner know if the +* current mapping is still valid. +*/ + +static void reset_tbs_array (void *p,uint32_t hash,void *userp) +{ +TBStatistics *tbs = p; +g_ptr_array_set_size (tbs->tbs,0 ); +} + +void tbstats_reset_tbs (void ) +{ +if (tb_ctx.tb_stats.map) { +qht_iter (&tb_ctx.tb_stats, reset_tbs_array,NULL ); + } +} +void init_tb_stats_htable (void ) {if (!tb_ctx.tb_stats.map &&tb_stats_collection_enabled ()) {
include/exec/tb-stats.h +8 -0
@@ -124,4 +124,12 @@ struct TbstatsCommand {void do_hmp_tbstats_safe (CPUState *cpu,run_on_cpu_data icmd); +/** +* tbstats_reset_tbs: reset the linked array of TBs +* +* Reset the list of tbs for a given array. Should be called from +* safe work during tb_flush. +*/ +void tbstats_reset_tbs (void ); +#endif
Signature · 1 line
2.25.1
PATCH v13 8/10 Adding info [tb-list|tb] commands to HMP (WIP)
In reply to Fei WuFrom: "Vanderson M. do Rosario" <[email protected]>
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.
[AJB: WIP - we still can't be safely sure a translation will succeed]
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
------------------------------
Message-Id: <[email protected]>
--- accel/tcg/monitor.c | 54 ++++++ accel/tcg/tb-stats.c | 322 +++++++++++++++++++++++++++++++++++ disas/disas.c | 26 ++- hmp-commands-info.hx | 16 ++ include/exec/tb-stats.h | 33 +++- include/monitor/hmp.h | 2 + include/qemu/log-for-trace.h | 6 +- include/qemu/log.h | 2 + util/log.c | 66 +++++-- 9 files changed, 508 insertions(+), 19 deletions(-)
accel/tcg/monitor.c +54 -0
@@ -8,6 +8,7 @@#include "qemu/osdep.h" #include "qemu/accel.h" +#include "qemu/log.h" #include "qapi/error.h" #include "qapi/type-helpers.h" #include "qapi/qapi-commands-machine.h"
@@ -18,6 +19,7 @@#include "sysemu/cpu-timers.h" #include "sysemu/tcg.h" #include "exec/tb-stats.h" +#include "tb-context.h" #include "internal.h"
@@ -132,6 +134,58 @@ void hmp_tbstats(Monitor *mon, const QDict *qdict) } +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); +} + +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); +} +HumanReadableText *qmp_x_query_profile (Error **errp) {g_autoptr (GString) buf =g_string_new ("" );
accel/tcg/tb-stats.c +322 -0
350 lines not on this page · raw message
disas/disas.c +23 -3
@@ -8,6 +8,8 @@#include "hw/core/cpu.h" #include "exec/memory.h" +#include "qemu/log-for-trace.h" +/* Filled in by elfload.c. Simplistic, but will do for now. */ struct syminfo *syminfos =NULL ;
@@ -199,6 +201,24 @@ static void initialize_debug_host(CPUDebug *s)#endif } +static int +__attribute__((format (printf,2 ,3 ))) +fprintf_log (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,uint64_t code,size_t size) {
@@ -207,7 +227,7 @@ void target_disas(FILE *out, CPUState *cpu, uint64_t code, size_t size)CPUDebug s;disas_initialize_debug_target (&s, cpu); - s.info.fprintf_func = fprintf; + s.info.fprintf_func = fprintf_log; s.info.stream = out; s.info.buffer_vma = code; s.info.buffer_length = size;
@@ -221,9 +241,9 @@ void target_disas(FILE *out, CPUState *cpu, uint64_t code, size_t size) }for (pc = code; size >0 ; pc += count, size -= count) { -fprintf (out,"0x%08" PRIx64": " , pc); +fprintf_log (out,"0x%08" PRIx64": " , pc); count = s.info.print_insn (pc, &s.info); -fprintf (out,"\n" ); +fprintf_log (out,"\n" );if (count <0 ) {break ; }
hmp-commands-info.hx +16 -0
@@ -262,6 +262,22 @@ ERST .params = "", .help = "show dynamic compiler info", }, + { + .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, + }, #endif SRST
include/exec/tb-stats.h +31 -2
@@ -36,8 +36,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)
@@ -66,6 +69,8 @@ struct TBStatistics {struct {unsigned long normal;unsigned long atomic; +/* filled only when dumping x% cover set */ +uint16_t coverage; } executions;/* JIT Stats - protected by lock */
@@ -88,7 +93,6 @@ struct TBStatistics {struct {unsigned long total; -unsigned long uncached;unsigned long spanning; } translations;
@@ -108,6 +112,9 @@ struct TBStatistics {uint64_t la;uint64_t code; } gen_times; + +/* HMP information - used for referring to previous search */ +int display_id; };bool tb_stats_cmp (const void *ap,const void *bp);
@@ -132,4 +139,26 @@ void do_hmp_tbstats_safe(CPUState *cpu, run_on_cpu_data icmd);*/ void tbstats_reset_tbs (void ); +/** +* 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); +#endif
include/monitor/hmp.h +2 -0
@@ -182,5 +182,7 @@ void hmp_boot_set(Monitor *mon, const QDict *qdict);void hmp_info_mtree (Monitor *mon,const QDict *qdict);void hmp_info_cryptodev (Monitor *mon,const QDict *qdict);void hmp_tbstats (Monitor *mon,const QDict *qdict); +void hmp_info_tblist (Monitor *mon,const QDict *qdict); +void hmp_info_tb (Monitor *mon,const QDict *qdict);#endif
include/qemu/log-for-trace.h +5 -1
@@ -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)
@@ -30,6 +33,7 @@ static inline bool qemu_loglevel_mask(int mask) }/* main logging function */ -void G_GNUC_PRINTF(1, 2) qemu_log(const char *fmt, ...); +int G_GNUC_PRINTF(1, 2) qemu_log(const char *fmt, ...); +int G_GNUC_PRINTF(1, 0) qemu_vlog(const char *fmt, va_list va);#endif
include/qemu/log.h +2 -0
@@ -85,6 +85,8 @@ extern const QEMULogItem qemu_log_items[];bool qemu_set_log (int log_flags,Error **errp);bool qemu_set_log_filename (const char *filename,Error **errp);bool qemu_set_log_filename_flags (const char *name,int flags,Error **errp); +void qemu_log_to_monitor (bool enable); +void qemu_log_to_string (bool enable,GString *s);void qemu_set_dfilter_ranges (const char *ranges,Error **errp);bool qemu_log_in_addr_range (uint64_t addr);int qemu_str_to_log_mask (const char *str);
util/log.c +53 -13
96 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v13 9/10 tb-stats: dump hot TBs at the end of the execution
In reply to Fei WuFrom: "Vanderson M. do Rosario" <[email protected]>
Dump the hottest TBs if -d tb_stats,dump_limit=N 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)Message-Id: <[email protected]>
--- accel/tcg/tb-stats.c | 21 +++++++++++++++++++++ include/exec/tb-stats-dump.h | 21 +++++++++++++++++++++ include/exec/tb-stats-flags.h | 1 + linux-user/exit.c | 2 ++ softmmu/runstate.c | 2 ++ stubs/tb-stats.c | 5 +++++ util/log.c | 4 ++-- 7 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 include/exec/tb-stats-dump.h
accel/tcg/tb-stats.c +21 -0
@@ -19,6 +19,7 @@#include "exec/tb-stats.h" #include "exec/tb-flush.h" +#include "exec/tb-stats-dump.h" #include "tb-context.h" #include "internal.h"
@@ -32,6 +33,7 @@ enum TBStatsStatus {static enum TBStatsStatus tcg_collect_tb_stats;static uint32_t default_tbstats_flag; +static int max_dump_tbs;/* only accessed in safe work */ static GList *last_search;
@@ -616,6 +618,20 @@ void dump_tb_info(int id, int log_mask, bool use_monitor) } +/* +* Dump the final stats +*/ +void tb_stats_dump (void ) +{ +if (!tb_stats_collection_enabled ()) { +return ; + } + +dump_tbs_info (max_dump_tbs,SORT_BY_HOTNESS , false); +} + +/* TBStatistic collection controls */ +void enable_collect_tb_stats (void ) { tcg_collect_tb_stats =TB_STATS_RUNNING ;
@@ -669,3 +685,8 @@ void set_default_tbstats_flag(uint32_t flags) { default_tbstats_flag = flags; } + +void set_tbstats_max_tbs (int max) +{ + max_dump_tbs = max; +}
include/exec/tb-stats-dump.h new file +21 -0
@@ -0,0 +1,21 @@ +/* +* TB Stats common dump functions across sysemu/linux-user +* +* Copyright (c) 2019 Linaro +* +* SPDX-License-Identifier: GPL-3.0-or-later +*/ + +#ifndef _TB_STATS_DUMP_H_ +#define _TB_STATS_DUMP_H_ + +/** +* tb_stats_dump: dump final tb_stats at end of execution +*/ +#ifdef CONFIG_TCG +void tb_stats_dump (void ); +#else +static inline void tb_stats_dump (void ) {/* do nothing */ }; +#endif + +#endif /* _TB_STATS_DUMP_H_ */
include/exec/tb-stats-flags.h +1 -0
@@ -26,6 +26,7 @@ bool tb_stats_collection_enabled(void);bool tb_stats_collection_disabled (void );bool tb_stats_collection_paused (void ); +void set_tbstats_max_tbs (int max);uint32_t get_default_tbstats_flag (void );void set_default_tbstats_flag (uint32_t );void set_tbstats_flags (uint32_t flags);
linux-user/exit.c +2 -0
@@ -25,6 +25,7 @@#ifdef CONFIG_GPROF #include <sys/gmon.h> #endif +#include "exec/tb-stats-dump.h" #ifdef CONFIG_GCOV extern void __gcov_dump (void );
@@ -41,4 +42,5 @@ void preexit_cleanup(CPUArchState *env, int code)gdb_exit (code);qemu_plugin_user_exit ();perf_exit (); +tb_stats_dump (); }
softmmu/runstate.c +2 -0
@@ -30,6 +30,7 @@#include "crypto/cipher.h" #include "crypto/init.h" #include "exec/cpu-common.h" +#include "exec/tb-stats-dump.h" #include "gdbstub/syscalls.h" #include "hw/boards.h" #include "migration/misc.h"
@@ -827,6 +828,7 @@ void qemu_cleanup(void)vm_shutdown ();replay_finish (); +tb_stats_dump ();job_cancel_sync_all ();bdrv_close_all ();
stubs/tb-stats.c +5 -0
@@ -21,6 +21,11 @@ bool tb_stats_collection_enabled(void)return false; } +void set_tbstats_max_tbs (int max) +{ +return ; +} +void set_default_tbstats_flag (uint32_t flags) {return ;
util/log.c +2 -2
@@ -49,7 +49,6 @@ static __thread Notifier qemu_log_thread_cleanup_notifier;int qemu_loglevel;static bool log_per_thread;static GArray *debug_regions; -int32_t max_num_hot_tbs_to_dump;static bool to_monitor;bool to_string;
@@ -568,7 +567,8 @@ int qemu_str_to_log_mask(const char *str)enable_collect_tb_stats (); }else if (tb_stats_collection_enabled () &&g_str_has_prefix (*tmp,"dump_limit=" )) { - max_num_hot_tbs_to_dump =atoi ((*tmp) +11 ); +int hot_tbs =atoi ((*tmp) +11 ); +set_tbstats_max_tbs (hot_tbs); }else if (tb_stats_collection_enabled () &&g_str_has_prefix (*tmp,"level=" )) {uint32_t flags =0 ;
Signature · 1 line
2.25.1
PATCH v13 10/10 docs: add tb-stats how to
In reply to Fei Wu--- docs/devel/tcg-tbstats.rst | 129 +++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 docs/devel/tcg-tbstats.rst
docs/devel/tcg-tbstats.rst new file +129 -0
@@ -0,0 +1,129 @@ +============ +TBStatistics +============ + +What is TBStatistics +==================== + +TBStatistics (tb_stats) is a tool to gather various internal information of TCG +during binary translation, this allows us to identify such as hottest TBs, +guest to host instruction translation ratio, number of spills during register +allocation and more. + + +How to use TBStatistics +======================= + +1. HMP interface +---------------- + +TBStatistics provides HMP interface, you can try the following examples after +connecting to the monitor. + +* First check the help info:: + + (qemu) help tb_stats + tb_stats command [stats_level] -- Control tb statistics collection:tb_stats (start|pause|stop|filter) [all|jit_stats|exec_stats] + + (qemu) help info tb-list + info tb-list [number sortedby] -- show a [number] translated blocks sorted by [sortedby]sortedby opts: hotness hg spills + + (qemu) help info tb + info tb id [flag1,flag2,...] -- show information about one translated block by id.dump flags can be used to set dump code level: out_asm in_asm op + +* Enable TBStatistics:: + + (qemu) tb_stats start all + (qemu) + +* Get interested TB list:: + + (qemu) info tb-list 2 + TB id:1 | phys:0x79bca0 virt:0xffffffff8059bca0 flags:0x01024001 0 inv/1 + | exec:1464084/0 guest inst cov:0.15% + | trans:1 ints: g:3 op:16 op_opt:15 spills:0 + | h/g (host bytes / guest insts): 64.000000 + | time to gen at 2.4GHz => code:607.08(ns) IR:250.83(ns) + + TB id:2 | phys:0x2adf0c virt:0xffffffff800adf0c flags:0x01024001 0 inv/1 + | exec:1033298/0 guest inst cov:0.28% + | trans:1 ints: g:8 op:35 op_opt:33 spills:0 + | h/g (host bytes / guest insts): 86.000000 + | time to gen at 2.4GHz => code:1429.58(ns) IR:545.42(ns) + +* Dive into the specific TB:: + + (qemu) info tb 1 op + ------------------------------ + + TB id:1 | phys:0x79bca0 virt:0xffffffff8059bca0 flags:0x01024001 7 inv/19 + | exec:2038349/0 guest inst cov:0.15% + | trans:19 ints: g:3 op:16 op_opt:15 spills:0 + | h/g (host bytes / guest insts): 64.000000 + | time to gen at 2.4GHz => code:133434.17(ns) IR:176988.33(ns) + + OP: + ld_i32 loc1,env,$0xfffffffffffffff0 + brcond_i32 loc1,$0x0,lt,$L0 + mov_i64 loc3,$0x7f3c70b3a4e0 + call inc_exec_freq,$0x1,$0,loc3 + + ---- ffffffff8059bca0 0000000000006422 + add_i64 loc5,x2/sp,$0x8 + qemu_ld_i64 x8/s0,loc5,un+leq,1 + + ---- ffffffff8059bca2 0000000000000000 + add_i64 x2/sp,x2/sp,$0x10 + + ---- ffffffff8059bca4 0000000000000000 + mov_i64 pc,x1/ra + and_i64 pc,pc,$0xfffffffffffffffe + call lookup_tb_ptr,$0x6,$1,tmp9,env + goto_ptr tmp9 + set_label $L0 + exit_tb $0x7f3e887a8043 + + ------------------------------ + +* Stop TBStatistics after investigation, this will disable TBStatistics completely.:: + + (qemu) tb_stats stop + (qemu) + +* Alternatively, TBStatistics can be paused, the previous collected TBStatistics + are not cleared but there is no TBStatistics recorded for new TBs.:: + + (qemu) tb_stats pause + (qemu) + +* Definitely, TBStatistics can be restarted for another round of investigation.:: + + (qemu) tb_stats start all + (qemu) + + +2. Dump at exit +--------------- + +New command line options have been added to enable dump TB information at exit::: + + -d tb_stats[[,level=(+all+jit+exec+time)][,dump_limit=<number>]] + +e.g. starting qemu like this::: + + -d tb_stats,dump_limit=2 + +Qemu prints the following at exit::: + + QEMU: Terminated + TB id:1 | phys:0x61be02 virt:0xffffffff8041be02 flags:0x01024001 0 inv/1 + | exec:72739176/0 guest inst cov:20.22% + | trans:1 ints: g:9 op:35 op_opt:33 spills:0 + | h/g (host bytes / guest insts): 51.555557 + | time to gen at 2.4GHz => code:1065.42(ns) IR:554.17(ns) + + TB id:2 | phys:0x61bc66 virt:0xffffffff8041bc66 flags:0x01024001 0 inv/1 + | exec:25069507/0 guest inst cov:0.77% + | trans:1 ints: g:1 op:15 op_opt:14 spills:0 + | h/g (host bytes / guest insts): 128.000000 + | time to gen at 2.4GHz => code:312.50(ns) IR:152.08(ns)
Signature · 1 line
2.25.1