From nobody Fri May 3 03:55:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1566408321; cv=none; d=zoho.com; s=zohoarc; b=RyJe369/JZNw5Z77yeuB8c0AF/QDmbrNzDyJywUCuEnBZO7Um4GD1JOtt6KF6k8WQTKaumG1vbudGMGkIwEsmgymY3mB0gg1rNoBT2M+aT8cDoUw8+C9gGt6sIi/2yQl7RbApSCe4aHaUF/kZqWRC8q+wtsIXxYBZIviCpjhjH0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566408321; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=/TwtU5ZretLYPQS3kivN+uyZQXZUjopxPXKQug4RjSA=; b=RYtWJPfVFGcV9IebpKs4sDjdYOPm0D9Gy9cCGURHgp7hhKTQaEMRLz/+pL1aVYmhDCXrqcbtfPruobcj175L3mALyk3voQZfWb8ciF1H5FcuBwr2kbj1/q1d3i6/lFhxHd94rad0/kFjdA5H9sAmE2LtEvtZtzUgx+vqVBdlPVM= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1566408321123273.9396422640601; Wed, 21 Aug 2019 10:25:21 -0700 (PDT) Received: from localhost ([::1]:50920 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0UMJ-0000o3-KK for importer@patchew.org; Wed, 21 Aug 2019 13:25:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39443) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0UKo-0007Gn-Uy for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:23:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0UKn-0008Ti-6q for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:23:46 -0400 Received: from mail-qk1-x741.google.com ([2607:f8b0:4864:20::741]:35122) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0UKn-0008TH-1h for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:23:45 -0400 Received: by mail-qk1-x741.google.com with SMTP id r21so2543874qke.2 for ; Wed, 21 Aug 2019 10:23:45 -0700 (PDT) Received: from vanderson-lmcad.gw.lmcad.ic.unicamp.br (gw.lmcad.ic.unicamp.br. [143.106.73.166]) by smtp.googlemail.com with ESMTPSA id a3sm9623998qtp.10.2019.08.21.10.23.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 10:23:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/TwtU5ZretLYPQS3kivN+uyZQXZUjopxPXKQug4RjSA=; b=B7mE+c+MwCAJqqgzRlphREid9eGU8oroypizW42J2/k7utIYJAy5Xb0YKcKowqHMZj Ow3h5qS2KeOvQvPQIbwuIjFoXmoj+Q0Lex+pQPxsl06eZKjo3m/KUiTzBKYSv+Sr9anU Kr/oRtpqEoHFuxI6B3hVMjnPMnpIXvmow5hwP2F2bB+m8CAqvfepBtsRIlHgmzwbZvGs a2n7EZurA+UkpPDO7F1OHylYghqOkVPCc0/4zi2HCjW1cS0ZLU3EzKCUWCyHcNq3eKhA lXcBakgjr9CJKoYDAvH8DYtimi2/3mcNQRXkCf9d1nhFZ4zZknItqMGv2AlC4OLp2HbG HxIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/TwtU5ZretLYPQS3kivN+uyZQXZUjopxPXKQug4RjSA=; b=nZUAAES1Di3gkKjdEXPb6ta4KTZzPk46HDQUMeyutCor3KFUxy44I/fHEzGxNvw5nf Wkzs+BYv1JVhUi8DXOkzREF+OveiNqeG4kGW/dLKMYNmIElphVXP+F8ULhEExF6/K1Vk OWnQTKdTTg6qc+vDtvxP3rTbS+O5pJ2LWTM04NE+8yDv0x+K5MyDYr3RZbXevKK1q+Ml E4kFXMuUta/+C9UDHAHkVFt34HEjHZ3OjYDnkfws5vm0v8Pgvo694iQ9AIoQCN6gRTmK 6JQl4BcnGJW9gut2mygoBQk5J/7eJVWB02SrcaH8KUm9usf7+nzrIBBZfU7W/oHbiMim WSjQ== X-Gm-Message-State: APjAAAUy0bu9l2hiSXckIQ4oBeo8+lxDLm1AgVG+qlVhVimxnXFQFbHK hWGzN9S+DQg6CqoW8lxZGSeHbtybA79hMA== X-Google-Smtp-Source: APXvYqwhPCCPtzlYwrSOYmI7QPu/0STy1jK7pitc0HWDCNxWHMPvfjTUj7arA/0rMMSQUUgmtw3PIA== X-Received: by 2002:a37:749:: with SMTP id 70mr31726705qkh.399.1566408224245; Wed, 21 Aug 2019 10:23:44 -0700 (PDT) From: vandersonmr To: qemu-devel@nongnu.org Date: Wed, 21 Aug 2019 14:23:20 -0300 Message-Id: <20190821172329.2062-2-vandersonmr2@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190821172329.2062-1-vandersonmr2@gmail.com> References: <20190821172329.2062-1-vandersonmr2@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::741 Subject: [Qemu-devel] [PATCH v6 01/10] accel: introducing TBStatistics structure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , vandersonmr , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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. Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Vanderson M. do Rosario --- 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 diff --git a/accel/tcg/Makefile.objs b/accel/tcg/Makefile.objs index d381a02f34..49ffe81b5d 100644 --- a/accel/tcg/Makefile.objs +++ b/accel/tcg/Makefile.objs @@ -2,7 +2,7 @@ obj-$(CONFIG_SOFTMMU) +=3D tcg-all.o obj-$(CONFIG_SOFTMMU) +=3D cputlb.o obj-y +=3D tcg-runtime.o tcg-runtime-gvec.o obj-y +=3D cpu-exec.o cpu-exec-common.o translate-all.o -obj-y +=3D translator.o +obj-y +=3D translator.o tb-stats.o =20 obj-$(CONFIG_USER_ONLY) +=3D user-exec.o obj-$(call lnot,$(CONFIG_SOFTMMU)) +=3D user-exec-stub.o diff --git a/accel/tcg/perf/Makefile.objs b/accel/tcg/perf/Makefile.objs new file mode 100644 index 0000000000..f82fba35e5 --- /dev/null +++ b/accel/tcg/perf/Makefile.objs @@ -0,0 +1 @@ +obj-y +=3D jitdump.o diff --git a/accel/tcg/tb-stats.c b/accel/tcg/tb-stats.c new file mode 100644 index 0000000000..02844717cb --- /dev/null +++ b/accel/tcg/tb-stats.c @@ -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 =3D TB_STATS_RUNNING; +} + +void disable_collect_tb_stats(void) +{ + tcg_collect_tb_stats =3D TB_STATS_PAUSED; +} + +void pause_collect_tb_stats(void) +{ + tcg_collect_tb_stats =3D TB_STATS_STOPPED; +} + +bool tb_stats_collection_enabled(void) +{ + return tcg_collect_tb_stats =3D=3D TB_STATS_RUNNING; +} + +bool tb_stats_collection_paused(void) +{ + return tcg_collect_tb_stats =3D=3D TB_STATS_PAUSED; +} diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 5d1e08b169..b7bccacd3b 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1118,6 +1118,23 @@ static inline void code_gen_alloc(size_t tb_size) } } =20 +/* + * 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 =3D ap; + const TBStatistics *b =3D bp; + + return a->phys_pc =3D=3D b->phys_pc && + a->pc =3D=3D b->pc && + a->cs_base =3D=3D b->cs_base && + a->flags =3D=3D b->flags; +} + static bool tb_cmp(const void *ap, const void *bp) { const TranslationBlock *a =3D ap; @@ -1137,6 +1154,7 @@ static void tb_htable_init(void) unsigned int mode =3D QHT_MODE_AUTO_RESIZE; =20 qht_init(&tb_ctx.htable, tb_cmp, CODE_GEN_HTABLE_SIZE, mode); + init_tb_stats_htable_if_not(); } =20 /* 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 ph= ys_pc, return tb; } =20 +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 =3D g_new0(TBStatistics, 1); + uint32_t hash =3D tb_stats_hash_func(phys_pc, pc, flags); + void *existing_stats =3D NULL; + new_stats->phys_pc =3D phys_pc; + new_stats->pc =3D pc; + new_stats->cs_base =3D cs_base; + new_stats->flags =3D flags; + new_stats->tb =3D 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 f= lush + * 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 =3D profile_getclock(); #endif =20 + /* + * 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 =3D tb_get_stats(phys_pc, pc, cs_base, flags, tb); + } else { + tb->tb_stats =3D NULL; + } + tcg_func_start(tcg_ctx); =20 tcg_ctx->cpu =3D env_cpu(env); diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 16034ee651..24bd6a0a0c 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -22,21 +22,11 @@ =20 #include "exec/tb-context.h" #include "sysemu/cpus.h" +#include "exec/tb-stats.h" =20 /* allow to see translation results - the slowdown should be negligible, s= o we leave it */ #define DEBUG_DISAS =20 -/* 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" =20 void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb, int max_in= sns); @@ -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; }; =20 extern bool parallel_cpus; diff --git a/include/exec/tb-context.h b/include/exec/tb-context.h index feb585e0a7..3cfb62a338 100644 --- a/include/exec/tb-context.h +++ b/include/exec/tb-context.h @@ -23,6 +23,17 @@ #include "qemu/thread.h" #include "qemu/qht.h" =20 +/* 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) =20 @@ -35,6 +46,7 @@ struct TBContext { =20 /* statistics */ unsigned tb_flush_count; + struct qht tb_stats; }; =20 extern TBContext tb_ctx; diff --git a/include/exec/tb-hash.h b/include/exec/tb-hash.h index 4f3a37d927..54c477fe79 100644 --- a/include/exec/tb-hash.h +++ b/include/exec/tb-hash.h @@ -64,4 +64,11 @@ uint32_t tb_hash_func(tb_page_addr_t phys_pc, target_ulo= ng pc, uint32_t flags, return qemu_xxhash7(phys_pc, pc, flags, cf_mask, trace_vcpu_dstate); } =20 +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 diff --git a/include/exec/tb-stats.h b/include/exec/tb-stats.h new file mode 100644 index 0000000000..cc8f8a6ce6 --- /dev/null +++ b/include/exec/tb-stats.h @@ -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 diff --git a/util/log.c b/util/log.c index 1d1b33f7d9..393a17115b 100644 --- a/util/log.c +++ b/util/log.c @@ -31,6 +31,8 @@ int qemu_loglevel; static int log_append =3D 0; static GArray *debug_regions; =20 +int tcg_collect_tb_stats; + /* Return the number of characters emitted. */ int qemu_log(const char *fmt, ...) { --=20 2.22.0 From nobody Fri May 3 03:55:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1566408323; cv=none; d=zoho.com; s=zohoarc; b=TNWjXWFwjwGiMfblReLS93Lp5lIm93S65QU8cnWZefM4EcmgpCUiqQuVHdY0urA+UYFboSfQ7BK8z3dxe2m+CfzAqV7WCh1GTjg+BA3rCyIlch8UXJgLKxnF/fLcBBhM8i6T3p2gWYimJAvOkTNBswbaXzj1Qq4uzfD+rk6MLLk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566408323; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=XfHF6ZY7bWaD3BX1+22k5hUlOW5ft3uZC3pebdXlS2k=; b=BE+UhJv0VGT6Gzpy0rxTBP9/axlDtQdMk4ggncqryCiWsrxjKP1WTZ+6anO+TNR1sSbzKxkoV++M8Q8M0EgwYivQVwa38JEhNS4QzeBTvBytXDFdkQT+Jybm3a+nsoeOVsDlBHa2ycTCU8LVbziRsltunnKiuCoOUnHqXQW5TI4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1566408323677629.5004013579425; Wed, 21 Aug 2019 10:25:23 -0700 (PDT) Received: from localhost ([::1]:50922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0UMM-0000u9-5K for importer@patchew.org; Wed, 21 Aug 2019 13:25:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39455) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0UKq-0007Ih-P9 for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:23:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0UKp-0008VD-5Y for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:23:48 -0400 Received: from mail-qk1-x743.google.com ([2607:f8b0:4864:20::743]:34597) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0UKp-0008Ut-1W for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:23:47 -0400 Received: by mail-qk1-x743.google.com with SMTP id m10so2539819qkk.1 for ; Wed, 21 Aug 2019 10:23:47 -0700 (PDT) Received: from vanderson-lmcad.gw.lmcad.ic.unicamp.br (gw.lmcad.ic.unicamp.br. [143.106.73.166]) by smtp.googlemail.com with ESMTPSA id a3sm9623998qtp.10.2019.08.21.10.23.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 10:23:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XfHF6ZY7bWaD3BX1+22k5hUlOW5ft3uZC3pebdXlS2k=; b=Ccl+bOR/iQQM6EcPXQGji8b3IccKvwqyVaQyj8+d2ugAWwgO/Yi1yCygamVWk0KuL6 szICHUeIVGeJgwidj/Uw1DH5NSzopdqe3fo8TrQpF2Cqub8s/vD1Tqb/JjoKqydzMTNW cVFh/XDXTQ/gW/CdTCRiiNrGkvVBdzkJE6QaPcWhJIUHYph6Os9uQ6KI6mRwiJuyngIX tUGAKv8wrr0NDlSLliJ+mDuU9t1zpilXXPRLD9d/YY1IAogoaBFYW0mz0QbtK0H9WIJ9 1HBh1Xeu609WdUfwjYWVHV3A2bUFc4LOMfa99O8mOJmkfBFrAwZYVbzqpwWisL5Hg+IK v1dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XfHF6ZY7bWaD3BX1+22k5hUlOW5ft3uZC3pebdXlS2k=; b=HcYSS1KAROIeDv6YqWqqqLmzczTDMVvQ/F+aRJB+wBLEQYpUCQ379OCMkXmakMSN4T 0MOKdquJacYUtgXLd5R85gTBp+7ejaO/d+62mb2T3N/bLCsUM69toMDKqNoEAmdv08zi VD223Bwm8080IurhGi3DxtcndU6VGMYb4Lm2qaf4TmB6FkMRnsVCrOzJncFKFkKn6I5q y/YyFGlxy+GuxKCLXP3ZRj9wudcxnahtRCPpVqFGuE7NQ81hVHGaLreL61JwD2pJpCRR UAuiu/YGRBRFMDSNY46o5i0/FGaDiCVYAHCB8jnrlCvLPbV4zZjtXS5vu9P86RDptz/o Fufw== X-Gm-Message-State: APjAAAXhsk/v+UznGGlAKhDUIwU7l3QagkanrU4dlR67BPc+VmV/LK+9 EQYwwTfcxOcTscLQKI8VV9XFFuzeXExqFg== X-Google-Smtp-Source: APXvYqwrKb+7bLloRTWJ6HGHk0m3ug9ZLrGu+J3pmaYXA3FT8B4W77n4jqxOLSDamWLM5+JkgrDsCw== X-Received: by 2002:a05:620a:710:: with SMTP id 16mr31037559qkc.382.1566408226237; Wed, 21 Aug 2019 10:23:46 -0700 (PDT) From: vandersonmr To: qemu-devel@nongnu.org Date: Wed, 21 Aug 2019 14:23:21 -0300 Message-Id: <20190821172329.2062-3-vandersonmr2@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190821172329.2062-1-vandersonmr2@gmail.com> References: <20190821172329.2062-1-vandersonmr2@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::743 Subject: [Qemu-devel] [PATCH v6 02/10] accel: collecting TB execution count X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , vandersonmr , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: Vanderson M. do Rosario --- 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(+) diff --git a/accel/tcg/cpu-exec.c b/accel/tcg/cpu-exec.c index 6c85c3ee1e..e54be69499 100644 --- a/accel/tcg/cpu-exec.c +++ b/accel/tcg/cpu-exec.c @@ -252,6 +252,10 @@ void cpu_exec_step_atomic(CPUState *cpu) =20 start_exclusive(); =20 + 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 =3D false; in_exclusive_region =3D true; diff --git a/accel/tcg/tb-stats.c b/accel/tcg/tb-stats.c index 02844717cb..3489133e9e 100644 --- a/accel/tcg/tb-stats.c +++ b/accel/tcg/tb-stats.c @@ -37,3 +37,8 @@ bool tb_stats_collection_paused(void) { return tcg_collect_tb_stats =3D=3D TB_STATS_PAUSED; } + +uint32_t get_default_tbstats_flag(void) +{ + return default_tbstats_flag; +} diff --git a/accel/tcg/tcg-runtime.c b/accel/tcg/tcg-runtime.c index 8a1e408e31..6f4aafba11 100644 --- a/accel/tcg/tcg-runtime.c +++ b/accel/tcg/tcg-runtime.c @@ -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 =3D (TBStatistics *) ptr; + g_assert(stats); + atomic_inc(&stats->executions.normal); +} diff --git a/accel/tcg/tcg-runtime.h b/accel/tcg/tcg-runtime.h index 4fa61b49b4..bf0b75dbe8 100644 --- a/accel/tcg/tcg-runtime.h +++ b/accel/tcg/tcg-runtime.h @@ -28,6 +28,8 @@ DEF_HELPER_FLAGS_1(lookup_tb_ptr, TCG_CALL_NO_WG_SE, ptr,= env) =20 DEF_HELPER_FLAGS_1(exit_atomic, TCG_CALL_NO_WG, noreturn, env) =20 +DEF_HELPER_FLAGS_1(inc_exec_freq, TCG_CALL_NO_RWG, void, ptr) + #ifdef CONFIG_SOFTMMU =20 DEF_HELPER_FLAGS_5(atomic_cmpxchgb, TCG_CALL_NO_WG, diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index b7bccacd3b..e72aeba682 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1785,6 +1785,13 @@ TranslationBlock *tb_gen_code(CPUState *cpu, */ if (tb_stats_collection_enabled()) { tb->tb_stats =3D tb_get_stats(phys_pc, pc, cs_base, flags, tb); + + if (qemu_log_in_addr_range(tb->pc)) { + uint32_t flag =3D get_default_tbstats_flag(); + if (flag & TB_EXEC_STATS) { + tb->tb_stats->stats_enabled |=3D TB_EXEC_STATS; + } + } } else { tb->tb_stats =3D NULL; } diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index 9226a348a3..396a11e828 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -46,6 +46,7 @@ void translator_loop(const TranslatorOps *ops, DisasConte= xtBase *db, =20 ops->init_disas_context(db, cpu); tcg_debug_assert(db->is_jmp =3D=3D DISAS_NEXT); /* no early exit */ + gen_tb_exec_count(tb); =20 /* Reset the temp count so that we can identify leaks */ tcg_clear_temp_count(); diff --git a/include/exec/gen-icount.h b/include/exec/gen-icount.h index f7669b6841..b3efe41894 100644 --- a/include/exec/gen-icount.h +++ b/include/exec/gen-icount.h @@ -7,6 +7,15 @@ =20 static TCGOp *icount_start_insn; =20 +static inline void gen_tb_exec_count(TranslationBlock *tb) +{ + if (tb_stats_enabled(tb, TB_EXEC_STATS)) { + TCGv_ptr ptr =3D 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; diff --git a/include/exec/tb-stats.h b/include/exec/tb-stats.h index cc8f8a6ce6..fdebe7831c 100644 --- a/include/exec/tb-stats.h +++ b/include/exec/tb-stats.h @@ -6,6 +6,9 @@ #include "exec/tb-context.h" #include "tcg.h" =20 +#define tb_stats_enabled(tb, JIT_STATS) \ + (tb && tb->tb_stats && (tb->tb_stats->stats_enabled & JIT_STATS)) + typedef struct TBStatistics TBStatistics; =20 /* @@ -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); =20 /* 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; =20 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); =20 +uint32_t get_default_tbstats_flag(void); + #endif diff --git a/util/log.c b/util/log.c index 393a17115b..29021a4584 100644 --- a/util/log.c +++ b/util/log.c @@ -32,6 +32,7 @@ static int log_append =3D 0; static GArray *debug_regions; =20 int tcg_collect_tb_stats; +uint32_t default_tbstats_flag; =20 /* Return the number of characters emitted. */ int qemu_log(const char *fmt, ...) --=20 2.22.0 From nobody Fri May 3 03:55:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1566408461; cv=none; d=zoho.com; s=zohoarc; b=Oq6g1s3AclOMBognYQitG/XjfyvWAb8SzrrGhsnBlvqtbdpYdixaHHSa5/NAV+JJJdJIAaYa7X+cvdSHOajEM/p7ULie9dbaqOkk7K/ZAtahPOtRZ0ouF9bXAomrG6Pm5KWX68ftgS/DDZmX2q3X3gp7mXAoWCeq8lK2lfDnZeo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566408461; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=vyCq6BCHwEIzOrWmfwoglKk2AHFeiL8Hmg/UroGRXQw=; b=XlrOCt1cH/KVNo8IQpJiKqI01iAhmeFEPb9LDUcY00uEDBWNvynd3FASQJBPTIg0nrSAAO6alyDzzi7CsiiXtRBUNcyezF7vAnIzHPznrWBDDKxb5ZKFzDs2i91Q/MvL4jxITBz4K1YzeZsVfaie5IrzGHETq8rviI2PRD+QFv0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1566408461086630.9903053183078; Wed, 21 Aug 2019 10:27:41 -0700 (PDT) Received: from localhost ([::1]:50966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0UOZ-0004P2-H1 for importer@patchew.org; Wed, 21 Aug 2019 13:27:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39467) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0UKs-0007LF-PA for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:23:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0UKr-00006K-Cx for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:23:50 -0400 Received: from mail-qt1-x841.google.com ([2607:f8b0:4864:20::841]:42632) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0UKr-000061-93 for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:23:49 -0400 Received: by mail-qt1-x841.google.com with SMTP id t12so3958049qtp.9 for ; Wed, 21 Aug 2019 10:23:49 -0700 (PDT) Received: from vanderson-lmcad.gw.lmcad.ic.unicamp.br (gw.lmcad.ic.unicamp.br. [143.106.73.166]) by smtp.googlemail.com with ESMTPSA id a3sm9623998qtp.10.2019.08.21.10.23.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 10:23:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vyCq6BCHwEIzOrWmfwoglKk2AHFeiL8Hmg/UroGRXQw=; b=PdKm/caSdLSZ4wwLGnTxAkHWsQIyLEAbTJpCD8twu7zU8lBT20NGOfeFchLmSjkrd6 UURZ4TrmP++7z3E4yp7f3amj01kh9AeqRGDhHUrXjzrbwrcLnWv/OikC7fsO1evgmQt7 UM1sVmfjBup/XFfxgYxtZgO6ZydIAWk1ppiFb33GUGFH6FT6f61UXQfhfSurgfVpi9wC UHL4EbTBvOo1jZR2vmH4XpGFvFs0cb9SEZFWm3Ibr66ZjuSvR1mC8XmJL/SzFqnbRu1C fw3xZgSifPn0cIoT5f+6Zz0C9zJLHtcCEDeVTiYElhl08M+MrE0tgK4WZKajPXPSnFbj UsuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vyCq6BCHwEIzOrWmfwoglKk2AHFeiL8Hmg/UroGRXQw=; b=EvJF+q/Uk0hEu0B3TcoXXQ8vvWVkzVX0rwezsCcFxvZYpG0FUVFrEeADBU5GWTV0cD Vnlc9wZg0h2e0K5W1B5XzXjdREr9fdLDuzLzxVfgZ/klhkdkID3HtfKrMn9rTeu3XtPy 5TgfEtzlUAEg6z5jghP9qTUQSvOFLVMAlDmLmaT7nI7xQCk9DXAl7v+7B6Gt/H1nF1Yv RD2KM1vd/UESxK6KOm9rK9Vv+ilPw/ixsPlDu0W/nYWTB0BF8uTrg5HRMexWyqDDosqC Jh/CF8j3Nr3HExtw2PbJOhLHh0TET3ME/MOfYyjld4u/TXE6AUNaeLFNmTB4Fxrq98q8 hKQA== X-Gm-Message-State: APjAAAW5s2PK1MrdYDTppIqjuhp9tYeeCH+YZTMFIeFIh0XiVt2bxfAe 8qwtgQarGgTDDZNfDQDLzgPFLhvDRqIFeg== X-Google-Smtp-Source: APXvYqyHmc/nlclI1MiszkokjqHvlVGibBcBAvqNuG2bRmIEt4uKlz7TUGwdlyy0ytuUj5otHswU/w== X-Received: by 2002:aed:35b4:: with SMTP id c49mr31056733qte.313.1566408228388; Wed, 21 Aug 2019 10:23:48 -0700 (PDT) From: vandersonmr To: qemu-devel@nongnu.org Date: Wed, 21 Aug 2019 14:23:22 -0300 Message-Id: <20190821172329.2062-4-vandersonmr2@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190821172329.2062-1-vandersonmr2@gmail.com> References: <20190821172329.2062-1-vandersonmr2@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::841 Subject: [Qemu-devel] [PATCH v6 03/10] accel: collecting JIT statistics X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , vandersonmr , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) If 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. Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Vanderson M. do Rosario --- 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(-) diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index e72aeba682..fb2fe0fa1f 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -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 =3D 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 =3D tb_get_stats(phys_pc, pc, cs_base, flags, tb); + uint32_t flag =3D get_default_tbstats_flag(); =20 if (qemu_log_in_addr_range(tb->pc)) { - uint32_t flag =3D get_default_tbstats_flag(); if (flag & TB_EXEC_STATS) { tb->tb_stats->stats_enabled |=3D TB_EXEC_STATS; } } + + if (flag & TB_JIT_STATS) { + tb->tb_stats->stats_enabled |=3D TB_JIT_STATS; + atomic_inc(&tb->tb_stats->translations.total); + } } else { tb->tb_stats =3D NULL; } @@ -1869,6 +1875,10 @@ TranslationBlock *tb_gen_code(CPUState *cpu, atomic_set(&prof->search_out_len, prof->search_out_len + search_size); #endif =20 + 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 =3D -1; if ((pc & TARGET_PAGE_MASK) !=3D virt_page2) { phys_page2 =3D 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 diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index 396a11e828..834265d5be 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -117,6 +117,10 @@ void translator_loop(const TranslatorOps *ops, DisasCo= ntextBase *db, db->tb->size =3D db->pc_next - db->pc_first; db->tb->icount =3D db->num_insns; =20 + 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)) { diff --git a/include/exec/tb-stats.h b/include/exec/tb-stats.h index fdebe7831c..38643f353e 100644 --- a/include/exec/tb-stats.h +++ b/include/exec/tb-stats.h @@ -34,6 +34,20 @@ struct TBStatistics { unsigned long atomic; } executions; =20 + 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, T= B_STATS_STOPPED }; =20 #define TB_NOTHING (1 << 0) #define TB_EXEC_STATS (1 << 1) +#define TB_JIT_STATS (1 << 2) =20 extern int tcg_collect_tb_stats; extern uint32_t default_tbstats_flag; diff --git a/tcg/tcg.c b/tcg/tcg.c index be2c33c400..446e3d1708 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -3126,6 +3126,11 @@ static void temp_sync(TCGContext *s, TCGTemp *ts, TC= GRegSet 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; =20 case TEMP_VAL_MEM: @@ -3997,6 +4002,8 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) int i, num_insns; TCGOp *op; =20 + s->current_tb =3D tb; + #ifdef CONFIG_PROFILER { int n =3D 0; @@ -4028,6 +4035,14 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) } #endif =20 + if (tb_stats_enabled(tb, TB_JIT_STATS)) { + int n =3D 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 =20 + if (tb_stats_enabled(tb, TB_JIT_STATS)) { + int n =3D 0; + QTAILQ_FOREACH(op, &s->ops, link) { + n++; + } + atomic_add(&tb->tb_stats->code.num_tcg_ops_opt, n); + } + tcg_reg_alloc_start(s); =20 s->code_buf =3D tb->tc.ptr; diff --git a/tcg/tcg.h b/tcg/tcg.h index b411e17a28..bf6f3bcba3 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -738,6 +738,8 @@ struct TCGContext { =20 uint16_t gen_insn_end_off[TCG_MAX_INSNS]; target_ulong gen_insn_data[TCG_MAX_INSNS][TARGET_INSN_START_WORDS]; + + TranslationBlock *current_tb; }; =20 extern TCGContext tcg_init_ctx; --=20 2.22.0 From nobody Fri May 3 03:55:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1566408333; cv=none; d=zoho.com; s=zohoarc; b=l+39yKexvqlW5HOxD8AcQrI9NkwIzvuGDJt1hxu9v6CFmz1v6/ID75dvJTlqsostGE4HSRDmdEh1IqestOYZT5QWpWdyZP54uucI5nMctQathENGIH67S///tlPpL0xlMwJgAchmmmhOK35Pi5mIa1WzjDWC7w+gprSVJDfyMAY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566408333; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=t+4ah4GfDzjLfIjSxSLFuAo97Ag0jncYXSunVwPS/A8=; b=i50PcnRRFdvELA+J60N00vE1b5giHY4ebUICJRqHFq6vLb24qfudIeaQsECXgpMFZQ8mpICo2GuxR9sZCBy6DvnPeEXOmIZCV50ZXctHDFj1vB0j0L1pvDM5Ei1yCgPVhclX1G0sm9RNqJlmzZFH6Sj5XBkIneYG++qQdWEK10g= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1566408333833620.3486830228273; Wed, 21 Aug 2019 10:25:33 -0700 (PDT) Received: from localhost ([::1]:50924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0UMU-00015v-AC for importer@patchew.org; Wed, 21 Aug 2019 13:25:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39479) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0UKv-0007Qz-Fc for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:23:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0UKt-00007r-F9 for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:23:53 -0400 Received: from mail-qk1-x743.google.com ([2607:f8b0:4864:20::743]:45735) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0UKt-00007d-AM for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:23:51 -0400 Received: by mail-qk1-x743.google.com with SMTP id m2so2495733qki.12 for ; Wed, 21 Aug 2019 10:23:51 -0700 (PDT) Received: from vanderson-lmcad.gw.lmcad.ic.unicamp.br (gw.lmcad.ic.unicamp.br. [143.106.73.166]) by smtp.googlemail.com with ESMTPSA id a3sm9623998qtp.10.2019.08.21.10.23.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 10:23:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=t+4ah4GfDzjLfIjSxSLFuAo97Ag0jncYXSunVwPS/A8=; b=V/kg2PetCafr/OO87OVkFr34zrqUBXJ9LtjdEKGGpDyZmCC4TxdBMLZJvl6ixzX+Q5 +zL9JTEqCnBKSWyhNBBNZQ5u2ccwfTaNzIAUiIAEkC4z5J90qU/TiOxNFqXmEcvZRYsA WsjBglg+SL3AoCA0gTJvDY6y49OeEHE3dNTgDtHUh8fGV9jzl+lfh6hmHtat+vkKEcqA pdBEU8+dYDiv3tNbRP+nDAaaat4cTEzDPiSHUHwewdlI8TRdFTUCxArIt1F64bnd5frX UfPeQ3qH6xIpURmJ3XODWRJ19jfz/D41c2IfQKvM4iwW/Oap6a7AuqqmYEhzitkSupAK x8yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=t+4ah4GfDzjLfIjSxSLFuAo97Ag0jncYXSunVwPS/A8=; b=ayd/qhYXUIXNomcUVZAb/kRgSJ424v/bOcS78EZlbYRRzQcazKIUkUiKcd6tJvns2Y mk/8Ystra8eXKY3vUdoyH3wIWJtQ3IhzlsLSJ5TlV+ZnH08IKh2l/AsF8Psr2bxLvowF BHuzkVyjJFI3Gxj8t6ofDkd6UPrjVPDLrErc/yu/XWZTLSdPhOaXQM6DKlSAZ++FX7ZH Nuj7KXkWFgHLfCGXC0VqC8ZcL95rDu+jshF2s8UzBJB/sgiNUHtpWuq5QwJ6Qid8bB3F awbz0hdpNAPTYdATx9FRadozxIUra+KlijF0j7pn125qRPEF+yBHlcizKQT9mihAwK7f Mypw== X-Gm-Message-State: APjAAAUNToN3ezX7AS7uLxp5eLgT68j+RsNDrXmf/bjF5Mic3YPnPtkM 2KjlvccMGf7BBuZHZJ2Q2l+8ViWcDVVKTw== X-Google-Smtp-Source: APXvYqwkBrIFsMCkqUJn0Ze9X3Trhn7q+V9Te6lqFOOVNIpzGrDeMoQKWr5kWsBGe/TdGk5/VtEcFA== X-Received: by 2002:a37:6756:: with SMTP id b83mr31392804qkc.170.1566408230543; Wed, 21 Aug 2019 10:23:50 -0700 (PDT) From: vandersonmr To: qemu-devel@nongnu.org Date: Wed, 21 Aug 2019 14:23:23 -0300 Message-Id: <20190821172329.2062-5-vandersonmr2@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190821172329.2062-1-vandersonmr2@gmail.com> References: <20190821172329.2062-1-vandersonmr2@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::743 Subject: [Qemu-devel] [PATCH v6 04/10] accel: replacing part of CONFIG_PROFILER with TBStats X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Paolo Bonzini , vandersonmr , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) We 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. Reviewed-by: Alex Benn=C3=A9e Signed-off-by: vandersonmr --- 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(-) diff --git a/accel/tcg/tb-stats.c b/accel/tcg/tb-stats.c index 3489133e9e..f53e889d01 100644 --- a/accel/tcg/tb-stats.c +++ b/accel/tcg/tb-stats.c @@ -1,9 +1,105 @@ #include "qemu/osdep.h" =20 #include "disas/disas.h" +#include "exec/exec-all.h" +#include "tcg.h" + +#include "qemu/qemu-print.h" =20 #include "exec/tb-stats.h" =20 +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 =3D userp; + TBStatistics *tbs =3D p; + + jpi->translations +=3D tbs->translations.total; + jpi->ops +=3D tbs->code.num_tcg_ops; + if (stat_per_translation(tbs, code.num_tcg_ops) > jpi->ops_max) { + jpi->ops_max =3D stat_per_translation(tbs, code.num_tcg_ops); + } + jpi->del_ops +=3D tbs->code.deleted_ops; + jpi->temps +=3D tbs->code.temps; + if (stat_per_translation(tbs, code.temps) > jpi->temps_max) { + jpi->temps_max =3D stat_per_translation(tbs, code.temps); + } + jpi->host +=3D tbs->code.out_len; + jpi->guest +=3D tbs->code.in_len; + jpi->search_data +=3D 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 =3D 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=3D%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=3D%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 =3D s->interm_time + s->code_time; + qemu_printf("JIT cycles %" PRId64 " (%0.3f s at 2.4 G= Hz)\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 =3D=3D 0) { + tot =3D 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->restor= e_count : 0); + } + } + g_free(jpi); +} + + void init_tb_stats_htable_if_not(void) { if (tb_stats_collection_enabled() && !tb_ctx.tb_stats.map) { diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index fb2fe0fa1f..fe890f0782 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -1774,8 +1774,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu, tb_overflow: =20 #ifdef CONFIG_PROFILER - /* includes aborted translations because of exceptions */ - atomic_set(&prof->tb_count1, prof->tb_count1 + 1); ti =3D profile_getclock(); #endif =20 @@ -1823,7 +1821,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu, } =20 #ifdef CONFIG_PROFILER - atomic_set(&prof->tb_count, prof->tb_count + 1); atomic_set(&prof->interm_time, prof->interm_time + profile_getclock() = - ti); ti =3D profile_getclock(); #endif @@ -1870,13 +1867,12 @@ TranslationBlock *tb_gen_code(CPUState *cpu, =20 #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 =20 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); } =20 #ifdef DEBUG_DISAS diff --git a/include/exec/tb-stats.h b/include/exec/tb-stats.h index 38643f353e..3f062fda5a 100644 --- a/include/exec/tb-stats.h +++ b/include/exec/tb-stats.h @@ -9,6 +9,9 @@ #define tb_stats_enabled(tb, JIT_STATS) \ (tb && tb->tb_stats && (tb->tb_stats->stats_enabled & JIT_STATS)) =20 +#define stat_per_translation(stat, name) \ + (stat->translations.total ? stat->name / stat->translations.total : 0) + typedef struct TBStatistics TBStatistics; =20 /* @@ -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; =20 struct { @@ -56,6 +65,8 @@ bool tb_stats_cmp(const void *ap, const void *bp); =20 void init_tb_stats_htable_if_not(void); =20 +void dump_jit_profile_info(TCGProfile *s); + /* TBStatistic collection controls */ enum TBStatsStatus { TB_STATS_RUNNING, TB_STATS_PAUSED, TB_STATS_STOPPED }; =20 diff --git a/tcg/tcg.c b/tcg/tcg.c index 446e3d1708..46b31a2f68 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -2295,9 +2295,9 @@ void tcg_op_remove(TCGContext *s, TCGOp *op) QTAILQ_INSERT_TAIL(&s->free_ops, op, link); s->nb_ops--; =20 -#ifdef CONFIG_PROFILER - atomic_set(&s->prof.del_op_count, s->prof.del_op_count + 1); -#endif + if (tb_stats_enabled(s->current_tb, TB_JIT_STATS)) { + atomic_inc(&s->current_tb->tb_stats->code.deleted_ops); + } } =20 static TCGOp *tcg_op_alloc(TCGOpcode opc) @@ -3914,16 +3914,6 @@ void tcg_profile_snapshot(TCGProfile *prof, bool cou= nters, bool table) =20 if (counters) { PROF_ADD(prof, orig, cpu_exec_time); - PROF_ADD(prof, orig, tb_count1); - PROF_ADD(prof, orig, tb_count); - PROF_ADD(prof, orig, op_count); - PROF_MAX(prof, orig, op_count_max); - PROF_ADD(prof, orig, temp_count); - PROF_MAX(prof, orig, temp_count_max); - PROF_ADD(prof, orig, del_op_count); - PROF_ADD(prof, orig, code_in_len); - PROF_ADD(prof, orig, code_out_len); - PROF_ADD(prof, orig, search_out_len); PROF_ADD(prof, orig, interm_time); PROF_ADD(prof, orig, code_time); PROF_ADD(prof, orig, la_time); @@ -4003,26 +3993,17 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *t= b) TCGOp *op; =20 s->current_tb =3D tb; - -#ifdef CONFIG_PROFILER - { + if (tb_stats_enabled(tb, TB_JIT_STATS)) { int n =3D 0; =20 QTAILQ_FOREACH(op, &s->ops, link) { n++; } - atomic_set(&prof->op_count, prof->op_count + n); - if (n > prof->op_count_max) { - atomic_set(&prof->op_count_max, n); - } + atomic_add(&tb->tb_stats->code.num_tcg_ops, n); =20 n =3D s->nb_temps; - atomic_set(&prof->temp_count, prof->temp_count + n); - if (n > prof->temp_count_max) { - atomic_set(&prof->temp_count_max, n); - } + atomic_add(&tb->tb_stats->code.temps, n); } -#endif =20 #ifdef DEBUG_DISAS if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP) @@ -4229,70 +4210,16 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *t= b) return tcg_current_code_size(s); } =20 -#ifdef CONFIG_PROFILER void tcg_dump_info(void) { + TCGProfile *s =3D NULL; +#ifdef CONFIG_PROFILER TCGProfile prof =3D {}; - const TCGProfile *s; - int64_t tb_count; - int64_t tb_div_count; - int64_t tot; - tcg_profile_snapshot_counters(&prof); s =3D &prof; - tb_count =3D s->tb_count; - tb_div_count =3D tb_count ? tb_count : 1; - tot =3D 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("translated TBs %" PRId64 " (aborted=3D%" PRId64 - " %0.1f%%)\n", - tb_count, s->tb_count1 - tb_count, - (double)(s->tb_count1 - s->tb_count) - / (s->tb_count1 ? s->tb_count1 : 1) * 100.0); - qemu_printf("avg ops/TB %0.1f max=3D%d\n", - (double)s->op_count / tb_div_count, s->op_count_max); - qemu_printf("deleted ops/TB %0.2f\n", - (double)s->del_op_count / tb_div_count); - qemu_printf("avg temps/TB %0.2f max=3D%d\n", - (double)s->temp_count / tb_div_count, s->temp_count_max); - qemu_printf("avg host code/TB %0.1f\n", - (double)s->code_out_len / tb_div_count); - qemu_printf("avg search data/TB %0.1f\n", - (double)s->search_out_len / tb_div_count); - =20 - qemu_printf("cycles/op %0.1f\n", - s->op_count ? (double)tot / s->op_count : 0); - qemu_printf("cycles/in byte %0.1f\n", - s->code_in_len ? (double)tot / s->code_in_len : 0); - qemu_printf("cycles/out byte %0.1f\n", - s->code_out_len ? (double)tot / s->code_out_len : 0); - qemu_printf("cycles/search byte %0.1f\n", - s->search_out_len ? (double)tot / s->search_out_len : 0); - if (tot =3D=3D 0) { - tot =3D 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) * 1= 00.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_co= unt : 0); -} -#else -void tcg_dump_info(void) -{ - qemu_printf("[TCG profiler not compiled]\n"); -} #endif + dump_jit_profile_info(s); +} =20 #ifdef ELF_HOST_MACHINE /* In order to use this feature, the backend needs to do three things: diff --git a/tcg/tcg.h b/tcg/tcg.h index bf6f3bcba3..026a066b9a 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -644,16 +644,6 @@ QEMU_BUILD_BUG_ON(NB_OPS > (1 << 8)); =20 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; --=20 2.22.0 From nobody Fri May 3 03:55:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1566408476; cv=none; d=zoho.com; s=zohoarc; b=XknG9EB3/Tfj2wzubNgRLSXIRQu5QcNWtela9I1LLFWC4855VtaGyJrReoRbZtCG/N9IXXp2kL4dD+gKH46WYvsb/x/w+rTOWwpo/UTgfQITwcciTnNAkBBGjm3gGYlGV1CgZbYXX3CUKSIjGfNZ6rafLAUC6B6m0sxu/PRHLPo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566408476; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=1dvvU81pjaheqM4gK1IhhUHdQL05DNmPKqT9kA5OjIM=; b=HvO2cruzd3Bf3glV4+71jk/9niZJUd1aMCTXPT2s6Cij1WGb4sy5yqOpHZPfqEWlrpE0N6lbK8iib4p8sJSUhfKX5hSn2fOSbgyyiOc7aBbmOvAa2rLCSWq0u0zHvyy8lBnIE9raJyUSsdYW/nJirao/sDZblZ+OtAT1rSQrEvw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1566408476089135.03645998978186; Wed, 21 Aug 2019 10:27:56 -0700 (PDT) Received: from localhost ([::1]:50972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0UOo-0004h2-C3 for importer@patchew.org; Wed, 21 Aug 2019 13:27:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39502) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0UKy-0007YA-VR for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:23:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0UKw-0000AB-9c for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:23:56 -0400 Received: from mail-qt1-x844.google.com ([2607:f8b0:4864:20::844]:45032) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0UKw-00009g-3T for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:23:54 -0400 Received: by mail-qt1-x844.google.com with SMTP id 44so3940407qtg.11 for ; Wed, 21 Aug 2019 10:23:54 -0700 (PDT) Received: from vanderson-lmcad.gw.lmcad.ic.unicamp.br (gw.lmcad.ic.unicamp.br. [143.106.73.166]) by smtp.googlemail.com with ESMTPSA id a3sm9623998qtp.10.2019.08.21.10.23.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 10:23:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1dvvU81pjaheqM4gK1IhhUHdQL05DNmPKqT9kA5OjIM=; b=UMu0SfvGDM/vI4WJSGq7hG423ws5fM1LK1M8cluOHAqTmyHsQ37kwA04mHhIvLt+qi WClHBreX8FLhdrYRoeSEdvRok9kd4clp2LKSjvF7RTzs8g/OxZOMuRfwniHYkt3Q1fee df/qhxczIDpTCdmgfbx7G512Wg47GIlzBR/V/N9EkwYv83IKYd6FtpwV1uhxUYwv6E+a a2X7phcoIfB/8pSxDISmYjJfZ1jh5p10tDXcJeePvYg/irCYkJEvpeoja5GrBHNtXNf5 A37JDg2jcrVEc31oDB42kYhg4eptN6XJQCF2Zmmm9sraC4pdKa5LP1nw18Eera9zO+ob 8jpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1dvvU81pjaheqM4gK1IhhUHdQL05DNmPKqT9kA5OjIM=; b=ChYJdasjwKcZ38xjcge4pQez011QPj87tLadeCVVcoD9z+cEHGdJ8b7HWyw+UUk7Jh IBY6ey1yoKuXt2p6TsELi0+tOjvSpEWdIjz26me/4ZgPAPHOF3+IssAMybRHuKBSzUJG QJ3Ca+aRGPgf4AxkGfEDHRx2xsMfNwdSAL5Lkn8m6kWBB/bIwytHiLDaXvXWWb4qVCS2 IxG8QMWQQpgXT3FX8guhOBW6cxg9DETDjGh/w/HRRcyinCLOCokRDevPSoKVdELWHbpm h76kvUECuHY0V6xZ+NCbF+3MgYntyaj6TUX9A8l52PFvydxIysH70H+KWVyZV6a3ppOB 0tKg== X-Gm-Message-State: APjAAAVkoitTcAEBelu14UOor/E3wiVLaiZFEF4vRdSSIIYRre4Lk8gU sy/27r6ZirccX+PH3ummRv+2dlL2JxTtxQ== X-Google-Smtp-Source: APXvYqxm/XlgQ4WiY2aUOT2CnpC2k3PTI7yBapXXzYIwMUH1To8RXAtsrsAWiiFqjmuYSl8z0mx6zg== X-Received: by 2002:ac8:6717:: with SMTP id e23mr30920450qtp.27.1566408233148; Wed, 21 Aug 2019 10:23:53 -0700 (PDT) From: vandersonmr To: qemu-devel@nongnu.org Date: Wed, 21 Aug 2019 14:23:24 -0300 Message-Id: <20190821172329.2062-6-vandersonmr2@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190821172329.2062-1-vandersonmr2@gmail.com> References: <20190821172329.2062-1-vandersonmr2@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::844 Subject: [Qemu-devel] [PATCH v6 05/10] accel: adding TB_JIT_TIME and full replacing CONFIG_PROFILER X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , vandersonmr , "Dr. David Alan Gilbert" , Markus Armbruster , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Replace 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. Signed-off-by: Vanderson M. do Rosario --- 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(-) diff --git a/accel/tcg/tb-stats.c b/accel/tcg/tb-stats.c index f53e889d01..e0ac254fc1 100644 --- a/accel/tcg/tb-stats.c +++ b/accel/tcg/tb-stats.c @@ -8,6 +8,8 @@ =20 #include "exec/tb-stats.h" =20 +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; }; =20 /* accumulate the statistics from all TBs */ @@ -40,6 +49,29 @@ static void collect_jit_profile_info(void *p, uint32_t h= ash, void *userp) jpi->host +=3D tbs->code.out_len; jpi->guest +=3D tbs->code.in_len; jpi->search_data +=3D tbs->code.search_out_len; + + jpi->interm_time +=3D stat_per_translation(tbs, time.interm); + jpi->code_time +=3D stat_per_translation(tbs, time.code); + jpi->opt_time +=3D stat_per_translation(tbs, time.opt); + jpi->la_time +=3D stat_per_translation(tbs, time.la); + jpi->restore_time +=3D tbs->time.restore; + jpi->restore_count +=3D 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 =3D tcg_cpu_exec_time(); + delta =3D 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 =3D cpu_exec_time; } =20 /* 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); =20 + uint64_t tot =3D 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 =3D=3D 0) { + tot =3D 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_coun= t); + qemu_printf(" avg cycles %0.1f\n", + jpi->restore_count ? (double)jpi->restore_time / jpi->rest= ore_count : 0); + if (s) { - int64_t tot =3D s->interm_time + s->code_time; - qemu_printf("JIT cycles %" PRId64 " (%0.3f s at 2.4 G= Hz)\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 =3D=3D 0) { - tot =3D 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->restor= e_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); diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index fe890f0782..a2e65bb85c 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -337,10 +337,11 @@ static int cpu_restore_state_from_tb(CPUState *cpu, T= ranslationBlock *tb, CPUArchState *env =3D cpu->env_ptr; uint8_t *p =3D tb->tc.ptr + tb->tc.size; int i, j, num_insns =3D tb->icount; -#ifdef CONFIG_PROFILER - TCGProfile *prof =3D &tcg_ctx->prof; - int64_t ti =3D profile_getclock(); -#endif + uint64_t ti =3D 0; + + if (tb_stats_enabled(tb, TB_JIT_TIME)) { + ti =3D profile_getclock(); + } =20 searched_pc -=3D GETPC_ADJ; =20 @@ -370,11 +371,11 @@ static int cpu_restore_state_from_tb(CPUState *cpu, T= ranslationBlock *tb, } restore_state_to_opc(env, tb, data); =20 -#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; } =20 @@ -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 =3D &tcg_ctx->prof; - int64_t ti; -#endif + uint64_t ti =3D 0; + assert_memory_lock(); =20 phys_pc =3D get_page_addr_code(env, pc); @@ -1773,9 +1772,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu, tcg_ctx->tb_cflags =3D cflags; tb_overflow: =20 -#ifdef CONFIG_PROFILER - ti =3D profile_getclock(); -#endif =20 /* * 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 |=3D TB_JIT_STATS; atomic_inc(&tb->tb_stats->translations.total); } + + if (flag & TB_JIT_TIME) { + tb->tb_stats->stats_enabled |=3D TB_JIT_TIME; + ti =3D profile_getclock(); + } } else { tb->tb_stats =3D NULL; } @@ -1820,10 +1821,10 @@ TranslationBlock *tb_gen_code(CPUState *cpu, tcg_ctx->tb_jmp_target_addr =3D tb->jmp_target_arg; } =20 -#ifdef CONFIG_PROFILER - atomic_set(&prof->interm_time, prof->interm_time + profile_getclock() = - ti); - ti =3D profile_getclock(); -#endif + if (tb_stats_enabled(tb, TB_JIT_TIME)) { + atomic_add(&tb->tb_stats->time.interm, profile_getclock() - ti); + ti =3D profile_getclock(); + } =20 gen_code_size =3D 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 =3D gen_code_size; =20 -#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); + } =20 if (tb_stats_enabled(tb, TB_JIT_STATS)) { atomic_add(&tb->tb_stats->code.in_len, tb->size); diff --git a/configure b/configure index 714e7fb6a1..0b3c45c05b 100755 --- a/configure +++ b/configure @@ -6614,9 +6614,6 @@ fi if test "$static" =3D "yes" ; then echo "CONFIG_STATIC=3Dy" >> $config_host_mak fi -if test "$profiler" =3D "yes" ; then - echo "CONFIG_PROFILER=3Dy" >> $config_host_mak -fi if test "$slirp" !=3D "no"; then echo "CONFIG_SLIRP=3Dy" >> $config_host_mak echo "CONFIG_SMBD_COMMAND=3D\"$smbd\"" >> $config_host_mak diff --git a/cpus.c b/cpus.c index 927a00aa90..d8e4e89c19 100644 --- a/cpus.c +++ b/cpus.c @@ -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; =20 assert(tcg_enabled()); -#ifdef CONFIG_PROFILER ti =3D profile_getclock(); -#endif + cpu_exec_start(cpu); ret =3D 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; } =20 diff --git a/include/exec/tb-stats.h b/include/exec/tb-stats.h index 3f062fda5a..0ea2639fd2 100644 --- a/include/exec/tb-stats.h +++ b/include/exec/tb-stats.h @@ -57,22 +57,39 @@ struct TBStatistics { unsigned long spanning; } translations; =20 + 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; }; =20 bool tb_stats_cmp(const void *ap, const void *bp); =20 +void dump_jit_exec_time_info(uint64_t dev_time); + void init_tb_stats_htable_if_not(void); =20 void dump_jit_profile_info(TCGProfile *s); =20 /* TBStatistic collection controls */ -enum TBStatsStatus { TB_STATS_RUNNING, TB_STATS_PAUSED, TB_STATS_STOPPED }; +enum TBStatsStatus { + TB_STATS_DISABLED =3D 0, + TB_STATS_RUNNING, + TB_STATS_PAUSED, + TB_STATS_STOPPED +}; =20 #define TB_NOTHING (1 << 0) #define TB_EXEC_STATS (1 << 1) #define TB_JIT_STATS (1 << 2) +#define TB_JIT_STATS (1 << 3) =20 extern int tcg_collect_tb_stats; extern uint32_t default_tbstats_flag; diff --git a/include/qemu/timer.h b/include/qemu/timer.h index 5d978e1634..27571a7037 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -1037,13 +1037,10 @@ static inline int64_t cpu_get_host_ticks(void) } #endif =20 -#ifdef CONFIG_PROFILER static inline int64_t profile_getclock(void) { return get_clock(); } =20 -extern int64_t dev_time; -#endif - +extern uint64_t dev_time; #endif diff --git a/monitor/misc.c b/monitor/misc.c index 00338c002a..4839d6875f 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -472,6 +472,11 @@ static void hmp_info_jit(Monitor *mon, const QDict *qd= ict) =20 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 QDic= t *qdict) mtree_info(flatview, dispatch_tree, owner); } =20 -#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 =3D tcg_cpu_exec_time(); - delta =3D 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 =3D cpu_exec_time; + dump_jit_exec_time_info(dev_time); dev_time =3D 0; } -#else -static void hmp_info_profile(Monitor *mon, const QDict *qdict) -{ - monitor_printf(mon, "Internal profiler not compiled\n"); -} -#endif =20 /* Capture support */ static QLIST_HEAD (capture_list_head, CaptureState) capture_head; diff --git a/tcg/tcg.c b/tcg/tcg.c index 46b31a2f68..1a306e1ec9 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -3885,82 +3885,34 @@ static void tcg_reg_alloc_call(TCGContext *s, TCGOp= *op) } } =20 -#ifdef CONFIG_PROFILER - /* avoid copy/paste errors */ #define PROF_ADD(to, from, field) \ do { \ (to)->field +=3D atomic_read(&((from)->field)); \ } while (0) =20 -#define PROF_MAX(to, from, field) \ - do { \ - typeof((from)->field) val__ =3D atomic_read(&((from)->field)); \ - if (val__ > (to)->field) { \ - (to)->field =3D 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 =3D atomic_read(&n_tcg_ctxs); - unsigned int i; =20 for (i =3D 0; i < n_ctxs; i++) { TCGContext *s =3D atomic_read(&tcg_ctxs[i]); const TCGProfile *orig =3D &s->prof; =20 - 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); =20 - for (i =3D 0; i < NB_OPS; i++) { - PROF_ADD(prof, orig, table_op_count[i]); - } + for (i =3D 0; i < NB_OPS; i++) { + PROF_ADD(prof, orig, table_op_count[i]); } } } =20 -#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 =3D {}; - int i; - - tcg_profile_snapshot_table(&prof); - for (i =3D 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 =3D atomic_read(&n_tcg_ctxs); unsigned int i; - int64_t ret =3D 0; + uint64_t ret =3D 0; =20 for (i =3D 0; i < n_ctxs; i++) { const TCGContext *s =3D 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 - =20 int tcg_gen_code(TCGContext *s, TranslationBlock *tb) { -#ifdef CONFIG_PROFILER - TCGProfile *prof =3D &s->prof; -#endif int i, num_insns; TCGOp *op; =20 @@ -4041,18 +3977,18 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *t= b) } #endif =20 -#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()); + } =20 #ifdef USE_TCG_OPTIMIZATIONS tcg_optimize(s); #endif =20 -#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()); + } =20 reachable_code_pass(s); liveness_pass_1(s); @@ -4075,9 +4011,9 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb) } } =20 -#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()); + } =20 #ifdef DEBUG_DISAS if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP_OPT) @@ -4110,14 +4046,17 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *t= b) s->pool_labels =3D NULL; #endif =20 + if (!tb_stats_collection_enabled()) { + QTAILQ_FOREACH(op, &s->ops, link) { + TCGOpcode opc =3D op->opc; + atomic_add(&s->prof.table_op_count[opc], 1); + } + } + num_insns =3D -1; QTAILQ_FOREACH(op, &s->ops, link) { TCGOpcode opc =3D op->opc; =20 -#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 *t= b) return tcg_current_code_size(s); } =20 +void tcg_dump_op_count(void) +{ + TCGProfile prof =3D {}; + int i; + + collect_tcg_profiler(&prof); + for (i =3D 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 =3D NULL; -#ifdef CONFIG_PROFILER TCGProfile prof =3D {}; - tcg_profile_snapshot_counters(&prof); s =3D &prof; -#endif + collect_tcg_profiler(s); dump_jit_profile_info(s); } =20 diff --git a/tcg/tcg.h b/tcg/tcg.h index 026a066b9a..12f54283db 100644 --- a/tcg/tcg.h +++ b/tcg/tcg.h @@ -644,12 +644,6 @@ QEMU_BUILD_BUG_ON(NB_OPS > (1 << 8)); =20 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; =20 @@ -677,9 +671,7 @@ struct TCGContext { =20 tcg_insn_unit *code_ptr; =20 -#ifdef CONFIG_PROFILER TCGProfile prof; -#endif =20 #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 =20 -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); =20 diff --git a/vl.c b/vl.c index b426b32134..ef7737a7bc 100644 --- a/vl.c +++ b/vl.c @@ -1781,17 +1781,11 @@ static bool main_loop_should_exit(void) =20 static void main_loop(void) { -#ifdef CONFIG_PROFILER - int64_t ti; -#endif + uint64_t ti; while (!main_loop_should_exit()) { -#ifdef CONFIG_PROFILER ti =3D profile_getclock(); -#endif main_loop_wait(false); -#ifdef CONFIG_PROFILER dev_time +=3D profile_getclock() - ti; -#endif } } =20 --=20 2.22.0 From nobody Fri May 3 03:55:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1566408639; cv=none; d=zoho.com; s=zohoarc; b=HCj7z1Knnb/Fef4VEILBTpoookqCrC9w4URCDG7YKAR3+zN5XouyB6ZmmAbEc2ZROpFwa8ihKdHfL3LLYxuorFGuBEle+FxtJnO4uYAgNm7Okxs6/duE9L1dpUWN/7yu8LTR7OygdxDDrWtl8rKm/nC4PBd+x0sYkaUFNizeCgw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566408639; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=JOq7NinA7j4io/JpGYTf/SDNjFm2qy7T6Z2TTp844mo=; b=L2MjTExGp/9XZPCuJ7HK/cezDO+HxQAB5/M+d9LVU8WmfZu3Nbq1eaA0LlQGVCNnak4QmEuPUt67R6tKwF7bUw0HaYePPBnQyiv1cK+Qthd5mzRR4o33ZN8S1dHDzAgZJ178GnoU305iwKjuWb6q/odK0wQ0tRVLTUybbiVszjA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1566408639233113.13786747020993; Wed, 21 Aug 2019 10:30:39 -0700 (PDT) Received: from localhost ([::1]:51084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0URR-0000BR-5K for importer@patchew.org; Wed, 21 Aug 2019 13:30:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39510) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0UL0-0007aI-1b for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:23:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0UKy-0000Co-7m for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:23:57 -0400 Received: from mail-qk1-x742.google.com ([2607:f8b0:4864:20::742]:34597) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0UKy-0000BL-3C for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:23:56 -0400 Received: by mail-qk1-x742.google.com with SMTP id m10so2540256qkk.1 for ; Wed, 21 Aug 2019 10:23:56 -0700 (PDT) Received: from vanderson-lmcad.gw.lmcad.ic.unicamp.br (gw.lmcad.ic.unicamp.br. [143.106.73.166]) by smtp.googlemail.com with ESMTPSA id a3sm9623998qtp.10.2019.08.21.10.23.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 10:23:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JOq7NinA7j4io/JpGYTf/SDNjFm2qy7T6Z2TTp844mo=; b=mL5Wy4KI605bz0dJP2oo0ZXeBnV1An1SqJ7NxwGFVPInJOeKB2H0DPlGn5aFRpknap RgXnXHbEDTNWMb8W6W+/3hO9Nn9sfIcMLiAju/4KQBPkctTE2XT/ZvlZvSRTL0Sdl8an J45cdwomA4Ak9BTPfewyiFLHr6PSdMDer92O6pSVAxYtJKC9vt9ImMPuNuN8+xNO5+fD 6w1/5nnG2RuNuNOZU2PZBRbdK2xvKxY0r+HELlDjKINg0k+gO66l0byI73XnPCysSZUs vLeoRXIF/uK78svfVD0ITl3hnfsNNrhUCHOB3MXEwulak0BQrUGG/ReXrGB5PfLFOvSw 6OfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JOq7NinA7j4io/JpGYTf/SDNjFm2qy7T6Z2TTp844mo=; b=YH4f4msLLqXOM4uiDt5Ah97gTucA3HJXxZWxxD8jQBx0Cz1xO3dbUZRrc1ttyjgdZM 460m2I8m8kUWNeX1DJJ6KnCt7o06TgX6QLetpriIjp8tvJkFWrOLmqr/Ys7s9s+LM9sV l/GHamVXBqwg9iUUKmNulE7kB6CPYp6WzGiEH+DabEnX6jsXi5neAWTiJ1WyhGc/s7vi gNIEMGz/QFb8YjTHD3o88mAzkZGrhp/t+y64NqA6uY2J0Dr60hnjttAYWCc3SWviwpmL 2uE/qYzG26yxm1h5OT1cXcpb7JRoiCFp3FWo4JPYmweJqH22HNaEPNeZpRmuQdVvo1Yl Vr+w== X-Gm-Message-State: APjAAAUcBffNTGA/1LWHw2ItdvHGoqEFONSqqjnj4gR4KmIo94PzjkNd t8MboG3D063hwG4wDP6m6dFbeDyX1mqdvA== X-Google-Smtp-Source: APXvYqyo91/BiTASwrCc+kATLlLzhfjgGOctG7yyjnF9XRQrEaUjVm72ppqU+Ei61p3YrnYCSFnZAg== X-Received: by 2002:a05:620a:13d1:: with SMTP id g17mr30946997qkl.499.1566408235285; Wed, 21 Aug 2019 10:23:55 -0700 (PDT) From: vandersonmr To: qemu-devel@nongnu.org Date: Wed, 21 Aug 2019 14:23:25 -0300 Message-Id: <20190821172329.2062-7-vandersonmr2@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190821172329.2062-1-vandersonmr2@gmail.com> References: <20190821172329.2062-1-vandersonmr2@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::742 Subject: [Qemu-devel] [PATCH v6 06/10] log: adding -d tb_stats to control tbstats X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , vandersonmr , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Adding -d tb_stats to control TBStatistics collection: -d tb_stats[[,level=3D(+all+jit+exec+time)][,dump_limit=3D]] "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=3Djit+time -d tb_stats,dump_limit=3D15 ... Signed-off-by: Vanderson M. do Rosario --- 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(-) diff --git a/accel/tcg/tb-stats.c b/accel/tcg/tb-stats.c index e0ac254fc1..8554174360 100644 --- a/accel/tcg/tb-stats.c +++ b/accel/tcg/tb-stats.c @@ -3,6 +3,7 @@ #include "disas/disas.h" #include "exec/exec-all.h" #include "tcg.h" +#include "qemu-common.h" =20 #include "qemu/qemu-print.h" =20 diff --git a/accel/tcg/translator.c b/accel/tcg/translator.c index 834265d5be..ea7c3a9f77 100644 --- a/accel/tcg/translator.c +++ b/accel/tcg/translator.c @@ -16,6 +16,7 @@ #include "exec/gen-icount.h" #include "exec/log.h" #include "exec/translator.h" +#include "qemu-common.h" =20 /* Pairs with tcg_clear_temp_count. To be called by #TranslatorOps.{translate_insn,tb_stop} if diff --git a/include/exec/gen-icount.h b/include/exec/gen-icount.h index b3efe41894..6f54586dd6 100644 --- a/include/exec/gen-icount.h +++ b/include/exec/gen-icount.h @@ -2,6 +2,7 @@ #define GEN_ICOUNT_H =20 #include "qemu/timer.h" +#include "qemu-common.h" =20 /* Helpers for instruction counting code generation. */ =20 diff --git a/include/exec/tb-stats.h b/include/exec/tb-stats.h index 0ea2639fd2..a607ceaa53 100644 --- a/include/exec/tb-stats.h +++ b/include/exec/tb-stats.h @@ -79,21 +79,6 @@ void init_tb_stats_htable_if_not(void); void dump_jit_profile_info(TCGProfile *s); =20 /* TBStatistic collection controls */ -enum TBStatsStatus { - TB_STATS_DISABLED =3D 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); diff --git a/include/qemu-common.h b/include/qemu-common.h index 0235cd3b91..3930b61ec0 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -130,4 +130,19 @@ void page_size_init(void); * returned. */ bool dump_in_progress(void); =20 +enum TBStatsStatus { + TB_STATS_DISABLED =3D 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 diff --git a/include/qemu/log.h b/include/qemu/log.h index b097a6cae1..a8d1997cde 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -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) =20 /* 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 diff --git a/tcg/tcg.c b/tcg/tcg.c index 1a306e1ec9..08f3d50199 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -35,6 +35,7 @@ #include "qemu/host-utils.h" #include "qemu/qemu-print.h" #include "qemu/timer.h" +#include "qemu-common.h" =20 /* Note: the long term plan is to reduce the dependencies on the QEMU CPU definitions. Currently they are used for qemu_ld/st diff --git a/util/log.c b/util/log.c index 29021a4584..09cfb13b45 100644 --- a/util/log.c +++ b/util/log.c @@ -19,17 +19,20 @@ =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" =20 static char *logfilename; FILE *qemu_logfile; int qemu_loglevel; static int log_append =3D 0; static GArray *debug_regions; +int32_t max_num_hot_tbs_to_dump; =20 int tcg_collect_tb_stats; uint32_t default_tbstats_flag; @@ -276,6 +279,9 @@ const QEMULogItem qemu_log_items[] =3D { { 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=3D(+all+jit+exec+time)][,dump_li= mit=3D]]", + "enable collection of TBs statistics" + "(and dump until given a limit if in user mode).\n" }, { 0, NULL, NULL }, }; =20 @@ -297,6 +303,35 @@ int qemu_str_to_log_mask(const char *str) trace_enable_events((*tmp) + 6); mask |=3D LOG_TRACE; #endif + } else if (g_str_has_prefix(*tmp, "tb_stats")) { + mask |=3D CPU_LOG_TB_STATS; + default_tbstats_flag =3D TB_JIT_STATS | TB_EXEC_STATS | TB_JIT= _TIME; + tcg_collect_tb_stats =3D TB_STATS_RUNNING; + } else if (tcg_collect_tb_stats =3D=3D TB_STATS_RUNNING && + g_str_has_prefix(*tmp, "dump_limit=3D")) { + + max_num_hot_tbs_to_dump =3D atoi((*tmp) + 11); + } else if (tcg_collect_tb_stats =3D=3D TB_STATS_RUNNING && + g_str_has_prefix(*tmp, "level=3D")) { + + default_tbstats_flag =3D 0; + char **level_parts =3D g_strsplit(*tmp + 6, "+", 0); + char **level_tmp; + for (level_tmp =3D level_parts; level_tmp && *level_tmp; level= _tmp++) { + if (g_str_equal(*level_tmp, "jit")) { + default_tbstats_flag |=3D TB_JIT_STATS; + } else if (g_str_equal(*level_tmp, "exec")) { + default_tbstats_flag |=3D TB_EXEC_STATS; + } else if (g_str_equal(*level_tmp, "time")) { + default_tbstats_flag |=3D TB_JIT_TIME; + } else if (g_str_equal(*level_tmp, "all")) { + default_tbstats_flag |=3D TB_JIT_STATS | TB_EXEC_STATS= | TB_JIT_TIME; + } else { + fprintf(stderr, "no option level=3D%s, valid options a= re:" + "all, jit, exec or/and time\n", *level_tmp); + exit(1); + } + } } else { for (item =3D qemu_log_items; item->mask !=3D 0; item++) { if (g_str_equal(*tmp, item->name)) { --=20 2.22.0 From nobody Fri May 3 03:55:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1566408442; cv=none; d=zoho.com; s=zohoarc; b=USFUApCTDcMDf9Xq/tr1wtIxdp/3XPJ36hmSl5gMHetm4KCbjtlNSX5I8sJKdKvwNhRxgEuosVfcmuo127u96mi/68HKqKUJqNyD02c24kraNkScZ/5NBtzEGXzO6SY9vKKCumDATkKhMmWooFOJ/By5ZOzAzfz/TYtGPX5rpi8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566408442; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=2OMuKEWX3HhH/rU8jwGd3aUuZK2eSsJvZM+u2kVWjEM=; b=nROcOcCbiVVlLljFZwGwriTEs/wPaIsHh+L2bhv4JB3+h1WNuDSM/Lf3kOToZtg8t8xb/KMFoMHjdNcDsBKvISDghg2GiP1bl7sJtEfKhNjvOhCAyizU6aM3KGPWasRJc2YEPkMLuTLr6ijDl7r3UWp16j1ElEki4kq3UEE3n/4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1566408442881725.1685832569284; Wed, 21 Aug 2019 10:27:22 -0700 (PDT) Received: from localhost ([::1]:50964 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0UOH-0003vf-6q for importer@patchew.org; Wed, 21 Aug 2019 13:27:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39531) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0UL3-0007gM-1P for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:24:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0UL1-0000GA-8W for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:24:00 -0400 Received: from mail-qt1-x841.google.com ([2607:f8b0:4864:20::841]:45720) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0UL1-0000Fv-3U for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:23:59 -0400 Received: by mail-qt1-x841.google.com with SMTP id k13so3939054qtm.12 for ; Wed, 21 Aug 2019 10:23:59 -0700 (PDT) Received: from vanderson-lmcad.gw.lmcad.ic.unicamp.br (gw.lmcad.ic.unicamp.br. [143.106.73.166]) by smtp.googlemail.com with ESMTPSA id a3sm9623998qtp.10.2019.08.21.10.23.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 10:23:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2OMuKEWX3HhH/rU8jwGd3aUuZK2eSsJvZM+u2kVWjEM=; b=ig5QcvFd0yHKvlcfZJ75t+5/DR6pDFCdBbCbnzJrACEQWPGc+hq8J5oyl/ATn7e6a4 pi0UXsHDoOASS7DH2lcv9YXN7a2zApYnGBrVJM7IrHgF/7GhmsaG9abG1qGEYngeWbqS ln/oa74AL4bBWfQbEKzujxy51dl4JR6czjwPMyp/DQza9vnxyM81qEz0qfqiFxfAN87X wAB21WakEUqlF52lvSszTnJ2smVuJ5epvtxbVpFUdPUQatSbDYqyQWCyBUfdEkcU6hhv eBCsmuJo1Rbs4gELpUplREBCZc8tuMNikgeGx84nmJAfupXKa47yB7evhXMiSCScyLJQ PVZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2OMuKEWX3HhH/rU8jwGd3aUuZK2eSsJvZM+u2kVWjEM=; b=OdOnAGDYRtIDGffA11QMlse/ymC4PWlfxg7krXAjC8AG/4CBCyaIIniF07YzxTVGdk DugKwaKha3xLbIjBfeJquEaH9BjwNyjPfWM6nQqlZ8VzAryRwodV2Ev1AGtXRaNfbJFg qdx7NySLbn4/FU2ucUT8gdgGrOjNxZjyKkrgfpRVlDyL/2Km2cntEv1dwxWumbzmWn+o RDi1UhPgEfM180A22M7vjr76nxx00dmoe9jSFoW89cIOLwIT4i/B/6XjtEmOyZi7jKZn mmJjeAAMJHXynqdRUFX+PaFtAx2Roo/aGqJK7Rpo2JVQnkpqW7Y3F0Zj1EHk6I2s3MHI akWg== X-Gm-Message-State: APjAAAXeqSDQ3qbXpSWoFhbkkFdc9aFq2GKEdxP2dNpq5Ohj2E/sPTYv lLevqPkISnPOsrBxpzSt1iFMojonZ51NJg== X-Google-Smtp-Source: APXvYqz6dCOqhp9GgxaZujGqkJPYXzMTK/SyTzNRtnpYg66OMfULzbCEVpR63V85tTiF8bXJn5CLuQ== X-Received: by 2002:a05:6214:32f:: with SMTP id j15mr1949861qvu.42.1566408238306; Wed, 21 Aug 2019 10:23:58 -0700 (PDT) From: vandersonmr To: qemu-devel@nongnu.org Date: Wed, 21 Aug 2019 14:23:26 -0300 Message-Id: <20190821172329.2062-8-vandersonmr2@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190821172329.2062-1-vandersonmr2@gmail.com> References: <20190821172329.2062-1-vandersonmr2@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::841 Subject: [Qemu-devel] [PATCH v6 07/10] monitor: adding tb_stats hmp command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , vandersonmr , "Dr . David Alan Gilbert" , Markus Armbruster , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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. Acked-by: Dr. David Alan Gilbert Signed-off-by: Vanderson M. do Rosario --- 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(+) diff --git a/accel/tcg/tb-stats.c b/accel/tcg/tb-stats.c index 8554174360..ffaa9d5d51 100644 --- a/accel/tcg/tb-stats.c +++ b/accel/tcg/tb-stats.c @@ -9,6 +9,9 @@ =20 #include "exec/tb-stats.h" =20 +/* only accessed in safe work */ +static GList *last_search; + uint64_t dev_time; =20 struct jit_profile_info { @@ -137,6 +140,96 @@ void dump_jit_profile_info(TCGProfile *s) g_free(jpi); } =20 +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 =3D icmd.host_ptr; + int cmd =3D cmdinfo->cmd; + uint32_t level =3D 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 s= tatistics */ + 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 one= s */ + 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 filt= ering!"); + 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 =3D last_search; iter; iter =3D g_list_next(iter)= ) { + TBStatistics *tbs =3D iter->data; + tbs->stats_enabled =3D level; + } + + tb_flush(cpu); + + break; + default: /* INVALID */ + g_assert_not_reached(); + break; + } + + g_free(cmdinfo); +} + =20 void init_tb_stats_htable_if_not(void) { @@ -172,6 +265,24 @@ bool tb_stats_collection_paused(void) return tcg_collect_tb_stats =3D=3D TB_STATS_PAUSED; } =20 +static void reset_tbstats_flag(void *p, uint32_t hash, void *userp) +{ + uint32_t flag =3D *((int *)userp); + TBStatistics *tbs =3D p; + tbs->stats_enabled =3D flag; +} + +void set_default_tbstats_flag(uint32_t flag) +{ + default_tbstats_flag =3D 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; diff --git a/hmp-commands.hx b/hmp-commands.hx index bfa5681dd2..419898751e 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1885,6 +1885,23 @@ STEXI @findex qemu-io Executes a qemu-io command on the given block device. =20 +ETEXI +#if defined(CONFIG_TCG) + { + .name =3D "tb_stats", + .args_type =3D "command:s,level:s?", + .params =3D "command [stats_level]", + .help =3D "Control tb statistics collection:" + "tb_stats (start|pause|stop|filter) [all|jit_stats= |exec_stats]", + .cmd =3D hmp_tbstats, + }, +#endif + +STEXI +@item tb_stats +@findex +Control recording tb statistics + ETEXI =20 { diff --git a/include/exec/tb-stats.h b/include/exec/tb-stats.h index a607ceaa53..b57324fc1a 100644 --- a/include/exec/tb-stats.h +++ b/include/exec/tb-stats.h @@ -6,6 +6,9 @@ #include "exec/tb-context.h" #include "tcg.h" =20 +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)) =20 @@ -74,10 +77,18 @@ bool tb_stats_cmp(const void *ap, const void *bp); =20 void dump_jit_exec_time_info(uint64_t dev_time); =20 +void set_tbstats_flags(uint32_t flags); void init_tb_stats_htable_if_not(void); =20 void dump_jit_profile_info(TCGProfile *s); =20 +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); =20 +void set_default_tbstats_flag(uint32_t flag); uint32_t get_default_tbstats_flag(void); =20 #endif diff --git a/include/qemu-common.h b/include/qemu-common.h index 3930b61ec0..d653c00d91 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -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) =20 extern int tcg_collect_tb_stats; extern uint32_t default_tbstats_flag; diff --git a/monitor/misc.c b/monitor/misc.c index 4839d6875f..6902e8addb 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -74,6 +74,8 @@ #include "sysemu/cpus.h" #include "qemu/cutils.h" #include "tcg/tcg.h" +#include "exec/tb-stats.h" +#include "qemu-common.h" =20 #if defined(TARGET_S390X) #include "hw/s390x/storage-keys.h" @@ -459,6 +461,49 @@ static void hmp_info_registers(Monitor *mon, const QDi= ct *qdict) } =20 #ifdef CONFIG_TCG +static void hmp_tbstats(Monitor *mon, const QDict *qdict) +{ + if (!tcg_enabled()) { + error_report("TB information is only available with accel=3Dtcg"); + return; + } + + char *cmd =3D (char *) qdict_get_try_str(qdict, "command"); + enum TbstatsCmd icmd =3D -1; + + if (strcmp(cmd, "start") =3D=3D 0) { + icmd =3D START; + } else if (strcmp(cmd, "pause") =3D=3D 0) { + icmd =3D PAUSE; + } else if (strcmp(cmd, "stop") =3D=3D 0) { + icmd =3D STOP; + } else if (strcmp(cmd, "filter") =3D=3D 0) { + icmd =3D FILTER; + } else { + error_report("invalid command!"); + return; + } + + char *slevel =3D (char *) qdict_get_try_str(qdict, "level"); + uint32_t level =3D TB_EXEC_STATS | TB_JIT_STATS | TB_JIT_TIME; + if (slevel) { + if (strcmp(slevel, "jit") =3D=3D 0) { + level =3D TB_JIT_STATS; + } else if (strcmp(slevel, "exec") =3D=3D 0) { + level =3D TB_EXEC_STATS; + } else if (strcmp(slevel, "time") =3D=3D 0) { + level =3D TB_JIT_TIME; + } + } + + struct TbstatsCommand *tbscommand =3D g_new0(struct TbstatsCommand, 1); + tbscommand->cmd =3D icmd; + tbscommand->level =3D level; + async_safe_run_on_cpu(first_cpu, do_hmp_tbstats_safe, + RUN_ON_CPU_HOST_PTR(tbscommand)); + +} + static void hmp_info_jit(Monitor *mon, const QDict *qdict) { if (!tcg_enabled()) { @@ -1089,8 +1134,12 @@ static void hmp_info_mtree(Monitor *mon, const QDict= *qdict) =20 static void hmp_info_profile(Monitor *mon, const QDict *qdict) { +#ifdef CONFIG_TCG dump_jit_exec_time_info(dev_time); dev_time =3D 0; +#else + error_report("TCG should be enabled!"); +#endif } =20 /* Capture support */ diff --git a/vl.c b/vl.c index ef7737a7bc..326090c36a 100644 --- a/vl.c +++ b/vl.c @@ -1781,11 +1781,17 @@ static bool main_loop_should_exit(void) =20 static void main_loop(void) { +#ifdef CONFIG_TCG uint64_t ti; +#endif while (!main_loop_should_exit()) { +#ifdef CONFIG_TCG ti =3D profile_getclock(); +#endif main_loop_wait(false); +#ifdef CONFIG_TCG dev_time +=3D profile_getclock() - ti; +#endif } } =20 --=20 2.22.0 From nobody Fri May 3 03:55:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1566408871; cv=none; d=zoho.com; s=zohoarc; b=AXcEyja5sYztzKuBvhrdGNzk05IFT02D5BCpuQbidmffd0t12sxaleiDHWohH4YBm+n8KetAv/ZyJ4MqxgsfK3kqDgqwhhqkzEqPqXAV1pPmxveJsNZgvMq077S48mr83P/usCIJYYz9ypv9fuEkR2HgasyiuXkSgWydj6hC4zE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566408871; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=OMYn7t5360NT7i2g8om/JilvHljTjKpAF0jQ2ReWS2U=; b=KrHuqGHRYwmPZM9AF+obxMxd2ivM8T3BR5WLMJMTqNhm3l9w9Wf819cr1S1wFfErHWQCdk/9VtjdK3juJqp9Duscp+GsdnUCb22JujaeAVIm7ABzx8+3uIFUaqtIwBjnaNBexEw3VXRMrL/b0ItkpPZaStWKMo4xgqwgaJmR6qQ= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 156640887169154.81962490329511; Wed, 21 Aug 2019 10:34:31 -0700 (PDT) Received: from localhost ([::1]:51124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0UVB-0004On-SC for importer@patchew.org; Wed, 21 Aug 2019 13:34:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39567) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0UL8-0007qr-GL for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:24:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0UL5-0000K6-AN for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:24:06 -0400 Received: from mail-qk1-x741.google.com ([2607:f8b0:4864:20::741]:41338) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0UL5-0000Jm-2n for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:24:03 -0400 Received: by mail-qk1-x741.google.com with SMTP id g17so2506337qkk.8 for ; Wed, 21 Aug 2019 10:24:03 -0700 (PDT) Received: from vanderson-lmcad.gw.lmcad.ic.unicamp.br (gw.lmcad.ic.unicamp.br. [143.106.73.166]) by smtp.googlemail.com with ESMTPSA id a3sm9623998qtp.10.2019.08.21.10.23.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 10:24:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OMYn7t5360NT7i2g8om/JilvHljTjKpAF0jQ2ReWS2U=; b=DQEg+evgnrOINSszhPidsc6A5IdIwj3MY8ZweYeb9eH6OLiAkkzcm20ErwwKSQQRFz NZCcfJl/eTTDd0M93FeidVXYqL9FQ1dZlvdWavoooKnWlrLJwrjQw0HhLU3786KPLPz8 eh5ypRgyypGyUPUv+9zsBSYF9rDViXuQVSh1DM8DVFp3NRQcmbMddPgAIUxcU3id9MGd hJw8AsygJG32uUTXxex8pLjH4s3ZHlUb0lBVhmp9jQnJPayodZeSUhiUmQkoqc/IOulv UIjpaQih5LdqT/AT3ZiLY5FRPVdnU4zEv0qt1rTDeswYVLKofC1h1RynpSFXi1a6ffmF CnSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OMYn7t5360NT7i2g8om/JilvHljTjKpAF0jQ2ReWS2U=; b=hlRBJEWqkiupcB5pg6qkT15yvtnJxjcB8x5FViTnaY1KC6oxv1N9x2N0ZKPcuIL8u6 92lCBd3U/uL2pr2WewRW9Hjgg6eDIUqGSkWcXGw78rjU9v4WghLz7GupLdCyaSsbOoSq 3PoVioqfkSja2UV0lxf3iP5m/I7tzzrkeQ8VQo7tmnJ1TzfyfqJrBegoPHCkVhxF9Zi8 U99KG6uvEQuRZsAO2EkABip6HIsmXoDvL3qhUeRoTj7rj5C8SwlmwvrLC13Y9ihO+hzC 2X5SjClAcf/4U0mKrciA2ygMjpNIeaKIm0N+w6VZqeoiWbWS6OdkxdUG0QK8ICbjS/Rx 4Ysg== X-Gm-Message-State: APjAAAVICyXgXd0WFSiUeUcZvGhM8+khG9Qd10IXo5p+54BdgFQCgY+l dCicfx+WW1Q38DzhPRVkq7zvSRJEK/04rA== X-Google-Smtp-Source: APXvYqxD4AtGrDCGsjqaORUDBMgUZede3pqb4YRrS/05mUHumtSwSadkXaCBHeQ2MM4ixdS6AXs8Rw== X-Received: by 2002:a37:a397:: with SMTP id m145mr31299270qke.271.1566408242036; Wed, 21 Aug 2019 10:24:02 -0700 (PDT) From: vandersonmr To: qemu-devel@nongnu.org Date: Wed, 21 Aug 2019 14:23:27 -0300 Message-Id: <20190821172329.2062-9-vandersonmr2@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190821172329.2062-1-vandersonmr2@gmail.com> References: <20190821172329.2062-1-vandersonmr2@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::741 Subject: [Qemu-devel] [PATCH v6 08/10] Adding info [tb-list|tb|coverset] commands to HMP. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , vandersonmr , "Dr. David Alan Gilbert" , Markus Armbruster , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 =3D> 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 =3D> 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 =3D> code:3130.83(ns) IR:722.50(ns) | targets: 0x0000000000034d19 (id:12), 0x0000000000034d54 (id:1) Acked-by: Dr. David Alan Gilbert ---------------- 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 =3D> 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 =3D> 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 ------------------------------ Signed-off-by: Vanderson M. do Rosario --- 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(-) diff --git a/accel/tcg/tb-stats.c b/accel/tcg/tb-stats.c index ffaa9d5d51..875bc026b7 100644 --- a/accel/tcg/tb-stats.c +++ b/accel/tcg/tb-stats.c @@ -11,9 +11,35 @@ =20 /* only accessed in safe work */ static GList *last_search; - +int id =3D 1; /* display_id increment counter */ uint64_t dev_time; =20 +static TBStatistics *get_tbstats_by_id(int id) +{ + GList *iter; + + for (iter =3D last_search; iter; iter =3D g_list_next(iter)) { + TBStatistics *tbs =3D iter->data; + if (tbs && tbs->display_id =3D=3D id) { + return tbs; + break; + } + } + return NULL; +} + +static TBStatistics *get_tbstats_by_addr(target_ulong pc) +{ + GList *iter; + for (iter =3D last_search; iter; iter =3D g_list_next(iter)) { + TBStatistics *tbs =3D iter->data; + if (tbs && tbs->pc =3D=3D 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); } =20 + void do_hmp_tbstats_safe(CPUState *cpu, run_on_cpu_data icmd) { struct TbstatsCommand *cmdinfo =3D icmd.host_ptr; @@ -239,6 +266,398 @@ void init_tb_stats_htable_if_not(void) } } =20 +static void collect_tb_stats(void *p, uint32_t hash, void *userp) +{ + last_search =3D g_list_prepend(last_search, p); +} + +static void dump_tb_targets(TBStatistics *tbs) +{ + if (tbs && tbs->tb) { + TBStatistics *valid_target_tbstats[2] =3D {NULL, NULL}; + + /* + * Check and ensure that targets' tbstats have a valid display_id = and + * are in last_search list + */ + for (int jmp_id =3D 0; jmp_id < 2; jmp_id++) { + qemu_spin_lock(&tbs->tb->jmp_lock); + TranslationBlock *tb_dst =3D + (TranslationBlock *) (atomic_read(&tbs->tb->jmp_dest[jmp_i= d]) & ~1); + qemu_spin_unlock(&tbs->tb->jmp_lock); + + if (tb_dst) { + target_ulong pc =3D tb_dst ? tb_dst->pc : 0; + + /* Check if tb_dst is on the last_search list */ + TBStatistics *tbstats_pc =3D get_tbstats_by_addr(pc); + + /* if not in the last_search list, then insert it */ + if (!tbstats_pc) { + last_search =3D 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 =3D= =3D 0) { + tb_dst->tb_stats->display_id =3D id++; + valid_target_tbstats[jmp_id] =3D 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 =3D stat_per_translation(tbs, code.num_guest_inst); + unsigned ops =3D stat_per_translation(tbs, code.num_tcg_ops); + unsigned ops_opt =3D stat_per_translation(tbs, code.num_tcg_ops_opt); + unsigned spills =3D stat_per_translation(tbs, code.spills); + unsigned h =3D stat_per_translation(tbs, code.out_len); + + float guest_host_prop =3D 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->executio= ns.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 =3D> 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 =3D (TBStatistics *) p1; + const TBStatistics *tbs2 =3D (TBStatistics *) p2; + int sort_by =3D *((int *) psort_by); + unsigned long c1 =3D 0; + unsigned long c2 =3D 0; + + if (likely(sort_by =3D=3D SORT_BY_SPILLS)) { + c1 =3D stat_per_translation(tbs1, code.spills); + c2 =3D stat_per_translation(tbs2, code.spills); + } else if (likely(sort_by =3D=3D SORT_BY_HOTNESS)) { + c1 =3D stat_per_translation(tbs1, executions.normal); + c2 =3D stat_per_translation(tbs2, executions.normal); + } else if (likely(sort_by =3D=3D SORT_BY_HG)) { + if (tbs1->code.num_guest_inst =3D=3D 0) { + return -1; + } + if (tbs2->code.num_guest_inst =3D=3D 0) { + return 1; + } + + float a =3D + (float) stat_per_translation(tbs1, code.out_len) / tbs1->code.= num_guest_inst; + float b =3D + (float) stat_per_translation(tbs2, code.out_len) / tbs2->code.= num_guest_inst; + c1 =3D a <=3D b ? 0 : 1; + c2 =3D a <=3D b ? 1 : 0; + } + + return c1 < c2 ? 1 : c1 =3D=3D c2 ? 0 : -1; +} + +static void dump_last_search_headers(int count) +{ + if (!last_search) { + qemu_log("No data collected yet\n"); + return; + } + + GList *l =3D last_search; + while (l !=3D NULL && count--) { + TBStatistics *tbs =3D (TBStatistics *) l->data; + GList *next =3D l->next; + dump_tb_header(tbs); + l =3D next; + } +} + +static uint64_t calculate_last_search_coverages(void) +{ + uint64_t total_exec_count =3D 0; + GList *i; + + /* Compute total execution count for all tbs */ + for (i =3D last_search; i; i =3D i->next) { + TBStatistics *tbs =3D (TBStatistics *) i->data; + total_exec_count +=3D + (tbs->executions.atomic + tbs->executions.normal) * tbs->code.= num_guest_inst; + } + + for (i =3D last_search; i; i =3D i->next) { + TBStatistics *tbs =3D (TBStatistics *) i->data; + uint64_t tb_total_execs =3D + (tbs->executions.atomic + tbs->executions.normal) * tbs->code.= num_guest_inst; + tbs->executions.coverage =3D (10000 * tb_total_execs) / (total_exe= c_count + 1); + } + + return total_exec_count; +} + +static void do_dump_coverset_info(int percentage) +{ + mmap_lock(); + uint16_t total_coverage =3D 0; + unsigned coverset_size =3D 0; + percentage *=3D 100; + id =3D 1; + GList *i; + + g_list_free(last_search); + last_search =3D NULL; + + qht_iter(&tb_ctx.tb_stats, collect_tb_stats, NULL); + + int sort_by =3D SORT_BY_HOTNESS; + last_search =3D 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 =3D calculate_last_search_coverages(); + + /* Iterate and tbs display_id until reach the coverage percentage coun= t */ + for (i =3D last_search; i && total_coverage < percentage; i =3D i->nex= t) { + TBStatistics *tbs =3D (TBStatistics *) i->data; + tbs->display_id =3D id++; + coverset_size++; + total_coverage +=3D tbs->executions.coverage; + } + + /* free the unused bits */ + if (i) { + if (i->next) { + i->next->prev =3D NULL; + } + g_list_free(i->next); + i->next =3D 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 =3D 1; + GList *i; + int count =3D total; + + g_list_free(last_search); + last_search =3D NULL; + + qht_iter(&tb_ctx.tb_stats, collect_tb_stats, NULL); + + last_search =3D 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 =3D last_search; i && count--; i =3D i->next) { + TBStatistics *tbs =3D (TBStatistics *) i->data; + tbs->display_id =3D id++; + } + + /* free the unused bits */ + if (i) { + if (i->next) { + i->next->prev =3D NULL; + } + g_list_free(i->next); + i->next =3D 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 =3D 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 =3D g_new(struct tbs_dump_info, 1); + tbdi->count =3D count; + tbdi->sort_by =3D 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 =3D qemu_loglevel; + + CPUState *cpu =3D first_cpu; + uint32_t cflags =3D curr_cflags() | CF_NOCACHE; + TranslationBlock *tb =3D NULL; + + GString *code_s =3D g_string_new(NULL); + qemu_log_to_string(true, code_s); + + qemu_set_log(log_flags); + + if (sigsetjmp(cpu->jmp_env, 0) =3D=3D 0) { + mmap_lock(); + tb =3D 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 =3D 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 =3D (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 =3D 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 =3D g_new(struct tb_dump_info, 1); + + tbdi->id =3D id; + tbdi->log_flags =3D log_mask; + tbdi->use_monitor =3D 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(); diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index a2e65bb85c..fa163440dc 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -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 =3D tb_get_stats(phys_pc, pc, cs_base, flags, tb); uint32_t flag =3D get_default_tbstats_flag(); =20 diff --git a/disas.c b/disas.c index 3e2bfa572b..d5292d4246 100644 --- a/disas.c +++ b/disas.c @@ -8,6 +8,8 @@ #include "disas/disas.h" #include "disas/capstone.h" =20 +#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 */ =20 +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_ulon= g code, int count; CPUDebug s; =20 - INIT_DISASSEMBLE_INFO(s.info, out, fprintf); + INIT_DISASSEMBLE_INFO(s.info, out, fprintf_log); =20 s.cpu =3D cpu; s.info.read_memory_func =3D target_read_memory; @@ -460,11 +478,12 @@ void target_disas(FILE *out, CPUState *cpu, target_ul= ong code, } =20 for (pc =3D code; size > 0; pc +=3D count, size -=3D count) { - fprintf(out, "0x" TARGET_FMT_lx ": ", pc); - count =3D s.info.print_insn(pc, &s.info); - fprintf(out, "\n"); - if (count < 0) - break; + fprintf_log(out, "0x" TARGET_FMT_lx ": ", pc); + count =3D 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 instructi= on " diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index c59444c461..f415479011 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -289,6 +289,30 @@ ETEXI .help =3D "show dynamic compiler info", .cmd =3D hmp_info_jit, }, + { + .name =3D "tb-list", + .args_type =3D "number:i?,sortedby:s?", + .params =3D "[number sortedby]", + .help =3D "show a [number] translated blocks sorted by [sort= edby]" + "sortedby opts: hotness hg spills", + .cmd =3D hmp_info_tblist, + }, + { + .name =3D "tb", + .args_type =3D "id:i,flags:s?", + .params =3D "id [flag1,flag2,...]", + .help =3D "show information about one translated block by id= ." + "dump flags can be used to set dump code level: out_= asm in_asm op", + .cmd =3D hmp_info_tb, + }, + { + .name =3D "coverset", + .args_type =3D "coverage:i?", + .params =3D "[coverage]", + .help =3D "show hottest translated blocks neccesary to cover" + "[coverage]% of the execution count", + .cmd =3D hmp_info_coverset, + }, #endif =20 STEXI diff --git a/include/exec/tb-stats.h b/include/exec/tb-stats.h index b57324fc1a..69c3a8e5e1 100644 --- a/include/exec/tb-stats.h +++ b/include/exec/tb-stats.h @@ -9,8 +9,11 @@ enum SortBy { SORT_BY_HOTNESS, SORT_BY_HG /* Host/Guest */, SORT_BY_SPILLS= }; enum TbstatsCmd { START, PAUSE, STOP, FILTER }; =20 +#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)) =20 #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; =20 struct { @@ -56,7 +61,6 @@ struct TBStatistics { =20 struct { unsigned long total; - unsigned long uncached; unsigned long spanning; } translations; =20 @@ -69,6 +73,9 @@ struct TBStatistics { int64_t la; } time; =20 + /* 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 { =20 void do_hmp_tbstats_safe(CPUState *cpu, run_on_cpu_data icmd); =20 +/** + * 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); diff --git a/include/qemu/log-for-trace.h b/include/qemu/log-for-trace.h index 2f0a5b080e..3de88484cb 100644 --- a/include/qemu/log-for-trace.h +++ b/include/qemu/log-for-trace.h @@ -20,6 +20,9 @@ =20 /* Private global variable, don't use */ extern int qemu_loglevel; +extern bool to_string; + +extern int32_t max_num_hot_tbs_to_dump; =20 #define LOG_TRACE (1 << 15) =20 @@ -31,5 +34,6 @@ static inline bool qemu_loglevel_mask(int mask) =20 /* main logging function */ int GCC_FMT_ATTR(1, 2) qemu_log(const char *fmt, ...); +int qemu_vlog(const char *fmt, va_list va); =20 #endif diff --git a/include/qemu/log.h b/include/qemu/log.h index a8d1997cde..804cf90f0f 100644 --- a/include/qemu/log.h +++ b/include/qemu/log.h @@ -114,6 +114,8 @@ typedef struct QEMULogItem { extern const QEMULogItem qemu_log_items[]; =20 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); diff --git a/monitor/misc.c b/monitor/misc.c index 6902e8addb..26b19c62dc 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -504,6 +504,80 @@ static void hmp_tbstats(Monitor *mon, const QDict *qdi= ct) =20 } =20 +static void hmp_info_tblist(Monitor *mon, const QDict *qdict) +{ + int number_int; + const char *sortedby_str =3D NULL; + if (!tcg_enabled()) { + error_report("TB information is only available with accel=3Dtcg"); + return; + } + if (!tb_ctx.tb_stats.map) { + error_report("no TB information recorded"); + return; + } + + number_int =3D qdict_get_try_int(qdict, "number", 10); + sortedby_str =3D qdict_get_try_str(qdict, "sortedby"); + + int sortedby =3D SORT_BY_HOTNESS; + if (sortedby_str =3D=3D NULL || strcmp(sortedby_str, "hotness") =3D=3D= 0) { + sortedby =3D SORT_BY_HOTNESS; + } else if (strcmp(sortedby_str, "hg") =3D=3D 0) { + sortedby =3D SORT_BY_HG; + } else if (strcmp(sortedby_str, "spills") =3D=3D 0) { + sortedby =3D 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 =3D qdict_get_int(qdict, "id"); + const char *flags =3D qdict_get_try_str(qdict, "flags"); + int mask; + + if (!tcg_enabled()) { + error_report("TB information is only available with accel=3Dtcg"); + return; + } + + mask =3D 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=3Dtcg"); + return; + } + if (!tb_stats_collection_enabled()) { + error_report("TB information not being recorded"); + return; + } + + coverage =3D 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()) { diff --git a/util/log.c b/util/log.c index 09cfb13b45..7d28a844c1 100644 --- a/util/log.c +++ b/util/log.c @@ -33,28 +33,58 @@ int qemu_loglevel; static int log_append =3D 0; static GArray *debug_regions; int32_t max_num_hot_tbs_to_dump; +static bool to_monitor; +bool to_string; =20 int tcg_collect_tb_stats; uint32_t default_tbstats_flag; =20 -/* 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 =3D 0; - if (qemu_logfile) { - va_list ap; - va_start(ap, fmt); - ret =3D vfprintf(qemu_logfile, fmt, ap); - va_end(ap); - - /* Don't pass back error results. */ - if (ret < 0) { - ret =3D 0; + if (to_string) { + if (string) { + g_string_append_vprintf(string, fmt, va); } + } else if (to_monitor) { + ret =3D qemu_vprintf(fmt, va); + } else if (qemu_logfile) { + ret =3D vfprintf(qemu_logfile, fmt, va); + } + + /* Don't pass back error results. */ + if (ret < 0) { + ret =3D 0; } return ret; } =20 +/* Return the number of characters emitted. */ +int qemu_log(const char *fmt, ...) +{ + int ret =3D 0; + va_list ap; + va_start(ap, fmt); + + ret =3D qemu_vlog(fmt, ap); + + va_end(ap); + return ret; +} + +void qemu_log_to_monitor(bool enable) +{ + to_monitor =3D enable; +} + +void qemu_log_to_string(bool enable, GString *s) +{ + to_string =3D enable; + string =3D s; +} + static bool log_uses_own_buffers; =20 /* enable or disable low levels log */ --=20 2.22.0 From nobody Fri May 3 03:55:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1566408601; cv=none; d=zoho.com; s=zohoarc; b=XWL0oXmfp5etnr/Vy266kOLgIH/fnqokzMvLOKwwe8tKtxfqucx1Il7Pfl30j2q/I2e+X8NhnqlVbVRuKN9lvC6acVnTDiHlF7F32zUpRIW3Sn0sRHnbf1FmCqL3j6azyG/xyL/UClSd4OobUwrjTGQpasiHtLSOhIHAr1+syQ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566408601; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Fuop12Oaprtj7zpQ4AJuVY0ii2HhN4IYTAI/t2pejdo=; b=Y8nVOBs8DjEjxw9oyBZGuXTcv2NkYUgnOtNE5usjvIAdp5htR874/R79kvK3+lwBHVSpE4Ot8F38z9mBfQPP3saohOw4RaDKtt0MA9v2k4qKOV2HjLA8A1qCkPpHWiEtg2tBxKDabwTizaPPnZ/PmYrPBkxgxehzej5JgIVVDzs= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15664086010878.70192566168339; Wed, 21 Aug 2019 10:30:01 -0700 (PDT) Received: from localhost ([::1]:51082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0UQp-0007wy-0r for importer@patchew.org; Wed, 21 Aug 2019 13:29:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39572) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0UL9-0007rn-0H for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:24:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0UL7-0000Lk-Cv for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:24:06 -0400 Received: from mail-qt1-x842.google.com ([2607:f8b0:4864:20::842]:40328) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0UL7-0000LS-88 for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:24:05 -0400 Received: by mail-qt1-x842.google.com with SMTP id e8so3963185qtp.7 for ; Wed, 21 Aug 2019 10:24:05 -0700 (PDT) Received: from vanderson-lmcad.gw.lmcad.ic.unicamp.br (gw.lmcad.ic.unicamp.br. [143.106.73.166]) by smtp.googlemail.com with ESMTPSA id a3sm9623998qtp.10.2019.08.21.10.24.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 10:24:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Fuop12Oaprtj7zpQ4AJuVY0ii2HhN4IYTAI/t2pejdo=; b=UmRKlzWA+f0XU0M6hZJFULnZe3gdDjGfC4zcBXzK6pRva3rt0TfHYPOIaHdWdbAjag OtrBiSODLAF0Pn0oGw20vtBKlruhxPdJeUW2c5qIvFJ+6e8/J+S88ey0IV9uGm4NQl6b gstotMlBbsbJDVGc7sL9jo2augUgRQwjrnTT3/ko0JnAcjwBCWnSTlLeW6Ec2Xv3PyLM y+Wjn6171EJWPqNseoQ6jyNS1lGiDpm72k8G49kt1JOI81glTmvvRdQvnn21JpQPZXP4 Gnmv4DR+bdJXG6BCXCOhuOi3uWuhI9qZXi6roRr+pO/eKQv9dPsRfWMt4waYkm511Jht hqvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Fuop12Oaprtj7zpQ4AJuVY0ii2HhN4IYTAI/t2pejdo=; b=HYTBJeM6oN1b47n2xK+BsIqPTYr2X49O0SHsuSE2BRMilAMy10GiDsQJ6qKHt/uSTJ uLmxxcY2XRqI5cz5cCsAJZ5KpGWmYMc460nQYAh+8X81fNbCw8BNe7CKsx78c5WlC9E5 83KvhyrnhuanCRiAs47UkjCTdwGdAmics4VbZr0LkWvgiqQkRMpWfSuFYaDcxAhyQo42 oGe61W0bhfnFUtWNPWagoOlEFR5QadyEDkLSbinFEojlpVlt3EHqWqW6CcKj1bHU6Agr fYzHF/4LfSJHhwkC+v+bVc00tHHjRqFivXVQUXd2VtzIAqCzT587jivl5FxawR+AeuY1 GGPg== X-Gm-Message-State: APjAAAViMu1r9KkWYihvZxx65nFkFMdifvozYl4E1e7jrk7Sfo0kkLQd 9DyF7qFGPgAkIEqSe8OkqVegSyGbTV/8xA== X-Google-Smtp-Source: APXvYqw1fzfJlxrv9EzanrFwRE1afFs7IkaRlyVJ/n/TX8f/Fzj7wpL2equj8aiq03uEZzrImgZn6Q== X-Received: by 2002:ac8:6a19:: with SMTP id t25mr32288709qtr.267.1566408244466; Wed, 21 Aug 2019 10:24:04 -0700 (PDT) From: vandersonmr To: qemu-devel@nongnu.org Date: Wed, 21 Aug 2019 14:23:28 -0300 Message-Id: <20190821172329.2062-10-vandersonmr2@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190821172329.2062-1-vandersonmr2@gmail.com> References: <20190821172329.2062-1-vandersonmr2@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::842 Subject: [Qemu-devel] [PATCH v6 09/10] monitor: adding new info cfg command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , vandersonmr , "Dr. David Alan Gilbert" , Markus Armbruster , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 --- 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(+) diff --git a/accel/tcg/tb-stats.c b/accel/tcg/tb-stats.c index 875bc026b7..5bdcad2d80 100644 --- a/accel/tcg/tb-stats.c +++ b/accel/tcg/tb-stats.c @@ -657,6 +657,174 @@ void dump_tb_info(int id, int log_mask, bool use_moni= tor) /* tbdi free'd by do_dump_tb_info_safe */ } =20 +/* 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 =3D (int *) g_hash_table_lookup(cfg_nodes, from); + int *to_id =3D (int *) g_hash_table_lookup(cfg_nodes, to); + + if (!from_id || !to_id) { + return; + } + + GString *line =3D 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 =3D g_string_new(NULL);; + + uint32_t color =3D 0xFF666; + uint64_t count =3D tbs->executions.normal; + if (count > 1.6 * root_count) { + color =3D 0xFF000; + } else if (count > 1.2 * root_count) { + color =3D 0xFF333; + } else if (count < 0.4 * root_count) { + color =3D 0xFFCCC; + } else if (count < 0.8 * root_count) { + color =3D 0xFF999; + } + + GString *code_s =3D get_code_string(tbs, log_flags); + + for (int i =3D 0; i < code_s->len; i++) { + if (code_s->str[i] =3D=3D '\n') { + code_s->str[i] =3D ' '; + code_s =3D g_string_insert(code_s, i, "\\l"); + i +=3D 2; + } + } + + g_string_printf(line, + " node_%d [fillcolor=3D\"#%xFF0000\" shape=3D\"record\" " + "label=3D\"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 =3D g_new(int, 1); + *id =3D 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, i= nt 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 =3D NULL; + TranslationBlock *right_tb =3D NULL; + if (tbs->tb->jmp_dest[0]) { + left_tb =3D (TranslationBlock *) atomic_read(tbs->tb->jmp_= dest); + } + if (tbs->tb->jmp_dest[1]) { + right_tb =3D (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, lo= g_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 =3D icmd.host_ptr; + + GString *file_name =3D g_string_new(NULL);; + g_string_printf(file_name, "/tmp/qemu-cfg-tb-%d-%d.dot", id, info->dep= th); + FILE *dot =3D fopen(file_name->str, "w+"); + + fputs( + "digraph G {\n" + " mclimit=3D1.5;\n" + " rankdir=3DTD; ordering=3Dout;\n" + " graph[fontsize=3D10 fontname=3D\"Verdana\"];\n" + " color=3D\"#efefef\";\n" + " node[shape=3Dbox style=3Dfilled fontsize=3D8 fontname=3D\"= Verdana\" fillcolor=3D\"#efefef\"];\n" + " edge[fontsize=3D8 fontname=3D\"Verdana\"];\n" + , dot); + + cfg_nodes =3D 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 =3D 1; + root_count =3D 0; + + /* do a pre-order walk in the CFG with a limited depth */ + TBStatistics *root =3D get_tbstats_by_id(id); + if (root) { + root_count =3D root->executions.normal; + } + + struct PreorderInfo *info =3D g_new(struct PreorderInfo, 1); + info->tbs =3D root; + info->depth =3D depth + 1; + info->log_flags =3D log_flags; + async_safe_run_on_cpu(first_cpu, fputs_preorder_walk_safe, + RUN_ON_CPU_HOST_PTR(info)); +} + +/* TBStatistic collection controls */ + =20 void enable_collect_tb_stats(void) { @@ -706,3 +874,4 @@ uint32_t get_default_tbstats_flag(void) { return default_tbstats_flag; } + diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index f415479011..8c96924c0b 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -305,6 +305,13 @@ ETEXI "dump flags can be used to set dump code level: out_= asm in_asm op", .cmd =3D hmp_info_tb, }, + { + .name =3D "cfg", + .args_type =3D "id:i,depth:i?,flags:s?", + .params =3D "id [depth flags]", + .help =3D "plot CFG around TB with the given id", + .cmd =3D hmp_info_cfg, + }, { .name =3D "coverset", .args_type =3D "coverage:i?", diff --git a/include/exec/tb-stats.h b/include/exec/tb-stats.h index 69c3a8e5e1..0d7a03bdfa 100644 --- a/include/exec/tb-stats.h +++ b/include/exec/tb-stats.h @@ -129,6 +129,7 @@ void dump_tbs_info(int count, int sort_by, bool use_mon= itor); */ void dump_tb_info(int id, int log_mask, bool use_monitor); =20 +void dump_tb_cfg(int id, int depth, int log_flags); =20 /* TBStatistic collection controls */ void enable_collect_tb_stats(void); diff --git a/monitor/misc.c b/monitor/misc.c index 26b19c62dc..5cce807bb9 100644 --- a/monitor/misc.c +++ b/monitor/misc.c @@ -556,6 +556,28 @@ static void hmp_info_tb(Monitor *mon, const QDict *qdi= ct) dump_tb_info(id, mask, true); } =20 +static void hmp_info_cfg(Monitor *mon, const QDict *qdict) +{ + const int id =3D qdict_get_int(qdict, "id"); + const int depth =3D qdict_get_try_int(qdict, "depth", 3); + const char *flags =3D qdict_get_try_str(qdict, "flags"); + int mask; + + if (!tcg_enabled()) { + error_report("TB information is only available with accel=3Dtcg"); + return; + } + + mask =3D 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; --=20 2.22.0 From nobody Fri May 3 03:55:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1566409044; cv=none; d=zoho.com; s=zohoarc; b=IVRvpb5YzN0tQ5IuV4s3kuvUi/CbJOB8D76iE9XubEhiiyQC8iwBbHvJR2I+7UtKNYA+fYzDjNnXX6O0DEIpPbNb5YpDtC2r9CtFE1Ity8mUaPtE11zzFwsHE/JfJgt6g1YeEY6HwCsA0gtPwCPwoK8StleG0g9xWD7jFrBejjo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566409044; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=2vHSzjBBDOJZCdH5rqPViCfcareFW5HwMzJbdpbNj5s=; b=LxXI/oN4L4GS9oSbsR3WjTQDlz+DJRjsEo2kh3MAxDtsWFTYRI+Ee0KPOMbhSumscsbT9BDrNDWoZvwyJAjiQ4WJEaLenGInoDZTd/IrPv4FdaRLv/n4e7axtQJR0TvL7x1dUBC35RGdA9KqunZBsGz0EXvbpiSbv+7y8g/mef0= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 156640904492114.684549841393846; Wed, 21 Aug 2019 10:37:24 -0700 (PDT) Received: from localhost ([::1]:51182 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0UXz-0001C1-MC for importer@patchew.org; Wed, 21 Aug 2019 13:37:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39588) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0ULC-0007vn-BR for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:24:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0UL9-0000NC-9z for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:24:10 -0400 Received: from mail-qt1-x841.google.com ([2607:f8b0:4864:20::841]:39297) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0UL9-0000Mv-6K for qemu-devel@nongnu.org; Wed, 21 Aug 2019 13:24:07 -0400 Received: by mail-qt1-x841.google.com with SMTP id l9so3981792qtu.6 for ; Wed, 21 Aug 2019 10:24:07 -0700 (PDT) Received: from vanderson-lmcad.gw.lmcad.ic.unicamp.br (gw.lmcad.ic.unicamp.br. [143.106.73.166]) by smtp.googlemail.com with ESMTPSA id a3sm9623998qtp.10.2019.08.21.10.24.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 10:24:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2vHSzjBBDOJZCdH5rqPViCfcareFW5HwMzJbdpbNj5s=; b=bf4mS8n65pIy3QcGxZGX6BJG6ljjC7XXxBCpVPKgCLzh73WJXFg2vqIdcF5pLM3OUS 1IudgQUsWTazHmyIQdqTVhbso3IPVwSaGcPtq9B5Mfl7dJELu1G/Vj72Y8RBYUOYJ/ap dUe+GNC9jOw8K9pb17wNZJbayJ/6ihZNTFizIe96YQn8zvOK9+Hx+DtLhtOcRVi8xy2j G0XSaO4k9Rwf5QxGCJAhAtaWjrlEpAd4JVs2vS3TjTps+g4w/m9qGg5K+X3r/MVJI+W4 6V92BXWZTwSFgfmNggfOGR2OiIl2I8otNjgXoQ9oUo/Vdxqvzc+tFc6H9BfKg+Mksn8M 2wiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2vHSzjBBDOJZCdH5rqPViCfcareFW5HwMzJbdpbNj5s=; b=TGa8a6iPQGqtf5j1O02h6VB/aAQ/sC4TKUkbUz3ojIjq+9Sk12GeBSG7Vjayedqd8s CettkIkW/EJH61LPzOYmrimGrV8/ma8VEAPYwgnx1xW5hx8D4uf7aou+t2MHuAGvpfx+ +/f3iYQcUB5uz/TG1v2vM7QV/hMf0HR1omt2uM9eJvfuP4KKF9uP6DQwaDD1Q29KcH1L u58X+S2+prYJGsoludHFUYbTNN7RX0nganMRa3mXpYdnLKbbyCsjhx8BuTfSHy/uRLhJ PdJnn7n3eM9PEPcgxD1FwE5zzqJv2jK5ujQMq6RPlUYKGYf6Shc1cqMaiC3zCzVKTEgX 3CxQ== X-Gm-Message-State: APjAAAWVCLdikEYPJr8kCLQx/gocAI4T+b0sCOX7xF7Dsq+CRTqA+s9x VpFq7OV+EZE0W6kYDmllefvpOVnotxSqAA== X-Google-Smtp-Source: APXvYqwVJE5va73RMTNg25hQrAG8Er6Rdsi39iEmCy0er9kWC+SBoDmVT5HCwJDMtvCigZIb0FHloA== X-Received: by 2002:ac8:764f:: with SMTP id i15mr5061470qtr.194.1566408246520; Wed, 21 Aug 2019 10:24:06 -0700 (PDT) From: vandersonmr To: qemu-devel@nongnu.org Date: Wed, 21 Aug 2019 14:23:29 -0300 Message-Id: <20190821172329.2062-11-vandersonmr2@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190821172329.2062-1-vandersonmr2@gmail.com> References: <20190821172329.2062-1-vandersonmr2@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::841 Subject: [Qemu-devel] [PATCH v6 10/10] linux-user: dumping hot TBs at the end of the execution X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Riku Voipio , vandersonmr , Laurent Vivier Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" dumps, 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 =3D> 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 =3D> 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 =3D> code:1692.08(ns) IR:473.75(ns) | targets: 0x00000000000ec1c5 (id:4), 0x00000000000ec1cb (id:13) Signed-off-by: vandersonmr --- linux-user/exit.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/linux-user/exit.c b/linux-user/exit.c index bdda720553..7226104959 100644 --- a/linux-user/exit.c +++ b/linux-user/exit.c @@ -28,6 +28,10 @@ extern void __gcov_dump(void); =20 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 --=20 2.22.0