From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B085BC3A59F for ; Mon, 26 Aug 2019 16:46:06 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 70BDB206BA for ; Mon, 26 Aug 2019 16:46:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="urpUj3Zt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 70BDB206BA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:55794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2I85-0000I0-Jk for qemu-devel@archiver.kernel.org; Mon, 26 Aug 2019 12:46:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38821) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2Ho7-0001Jc-Ng for qemu-devel@nongnu.org; Mon, 26 Aug 2019 12:25:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i2Ho5-0007TE-OP for qemu-devel@nongnu.org; Mon, 26 Aug 2019 12:25:27 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:36787) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i2Ho5-0007SI-Dw for qemu-devel@nongnu.org; Mon, 26 Aug 2019 12:25:25 -0400 Received: by mail-wm1-x344.google.com with SMTP id g67so135655wme.1 for ; Mon, 26 Aug 2019 09:25:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version:content-transfer-encoding; bh=xkwqjIAieAgJLPpfhx1CmW5ykwyqR+Xa5mB93Rg7AZ8=; b=urpUj3ZtSU7gCsp3Boi2dOT8tp+2WsYGYY8gEOMp1BEqmPQ46f56K2o9hHOL+g+/PH vwaW26uniDs3aokyZpujeMWOg5ErJWdpYhAEFVSYCN4ZP4cxcp3cwnJ8QqjKnicrahvz Zj6pPFciB7AsMo1AgSJDlVjgX76v1kFyLG6YEC6ZTTo6htHtTZWeSRRv32znE0Pqtg02 0gTVEldzlqh3RnvUnQiR3D33sT3gzV+uTjVe3l7yj9zob1E71cLqcbtH8I9kzOJAis3S VLBsXHhbjisJxkR4BMua0XH5/WinW2IvJpfN5slpc2p9Rn1TuXUMJ5HC71XaPgKB/X+n xMXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version:content-transfer-encoding; bh=xkwqjIAieAgJLPpfhx1CmW5ykwyqR+Xa5mB93Rg7AZ8=; b=RYIh5t7TkdcPC5HVCCIZpSqV8748RP1QQauNhLrRynNggyJr74hzgAUF67eNeD5pkd 85Yd6OSK8ukn9Y42ur+LbFezyxnoF5mzrEhOTcx8ESGPvIboZP/uC7ll0b9Cxsbrpx5H AFxaH5Kz/hJk+rK66FFfsLUtlTDLdigU8SogCZAvX+Jy0HNRVHDw1+1d4HYDOS3VhPwk DG/SJnD+TMYVql/5BLe3xADcw4bPgOUcq0GWG2kUzn33yBbY5sb23XMNuKJdKrVFdy1m 0Q5l/aZ73HEpIok9eQNHtf7Gb40Dbh5Iie3tH58+h3O7K+4mwqnhNKx9GWzh9oW5te6h 4I+A== X-Gm-Message-State: APjAAAXUDq5CYWQRicpbq0t8EoVfGzm+LENP406exm/m7s4qFtBQ8eBE xCCD+++huhvY79ND4/QRI6FFRg== X-Google-Smtp-Source: APXvYqyL/ejU3lsOkKnS3Ld/h1gNh19Jbq1HXQxdO273SxVM1iLiWrWD3/0lTp+/oyPNakuUin5mOA== X-Received: by 2002:a1c:544e:: with SMTP id p14mr21747728wmi.4.1566836723975; Mon, 26 Aug 2019 09:25:23 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f24sm12837078wmc.25.2019.08.26.09.25.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2019 09:25:23 -0700 (PDT) Received: from zen (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E30921FF87; Mon, 26 Aug 2019 17:25:22 +0100 (BST) References: <20190821172329.2062-1-vandersonmr2@gmail.com> <20190821172329.2062-2-vandersonmr2@gmail.com> User-agent: mu4e 1.3.4; emacs 27.0.50 From: Alex =?utf-8?Q?Benn=C3=A9e?= To: vandersonmr In-reply-to: <20190821172329.2062-2-vandersonmr2@gmail.com> Date: Mon, 26 Aug 2019 17:25:22 +0100 Message-ID: <87ftlnzyfh.fsf@linaro.org> 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: 2a00:1450:4864:20::344 Subject: Re: [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: Paolo Bonzini , qemu-devel@nongnu.org, Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" vandersonmr writes: > 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 + Also I think the jitdump thing is a mismerge from the jit patches. > 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 > > 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) > } > } > > +/* > + * 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; > > qht_init(&tb_ctx.htable, tb_cmp, CODE_GEN_HTABLE_SIZE, mode); > + init_tb_stats_htable_if_not(); > } > > /* Must be called before using the QEMU cpus. 'tb_size' is the size > @@ -1666,6 +1684,34 @@ tb_link_page(TranslationBlock *tb, tb_page_addr_t = phys_pc, > return tb; > } > > +static TBStatistics *tb_get_stats(tb_page_addr_t phys_pc, target_ulong p= c, > + 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= flush > + * then just make the new TB point to the older TBStatistic > + */ > + g_free(new_stats); > + return existing_stats; > + } else { > + return new_stats; > + } > +} > + > + > /* Called with mmap_lock held for user mode emulation. */ > TranslationBlock *tb_gen_code(CPUState *cpu, > target_ulong pc, target_ulong cs_base, > @@ -1732,6 +1778,17 @@ TranslationBlock *tb_gen_code(CPUState *cpu, > ti =3D profile_getclock(); > #endif > > + /* > + * We want to fetch the stats structure before we start code > + * generation so we can count interesting things about this > + * generation. > + */ > + if (tb_stats_collection_enabled()) { > + tb->tb_stats =3D tb_get_stats(phys_pc, pc, cs_base, flags, tb); > + } else { > + tb->tb_stats =3D NULL; > + } > + > tcg_func_start(tcg_ctx); > > 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 @@ > > #include "exec/tb-context.h" > #include "sysemu/cpus.h" > +#include "exec/tb-stats.h" > > /* allow to see translation results - the slowdown should be negligible,= so we leave it */ > #define DEBUG_DISAS > > -/* Page tracking code uses ram addresses in system mode, and virtual > - addresses in userspace mode. Define tb_page_addr_t to be an appropri= ate > - type. */ > -#if defined(CONFIG_USER_ONLY) > -typedef abi_ulong tb_page_addr_t; > -#define TB_PAGE_ADDR_FMT TARGET_ABI_FMT_lx > -#else > -typedef ram_addr_t tb_page_addr_t; > -#define TB_PAGE_ADDR_FMT RAM_ADDR_FMT > -#endif > - > #include "qemu/log.h" > > void gen_intermediate_code(CPUState *cpu, TranslationBlock *tb, int max_= insns); > @@ -403,6 +393,9 @@ struct TranslationBlock { > uintptr_t jmp_list_head; > uintptr_t jmp_list_next[2]; > uintptr_t jmp_dest[2]; > + > + /* Pointer to a struct where statistics from the TB is stored */ > + TBStatistics *tb_stats; > }; > > extern bool parallel_cpus; > 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" > > +/* Page tracking code uses ram addresses in system mode, and virtual > + addresses in userspace mode. Define tb_page_addr_t to be an appropri= ate > + type. */ > +#if defined(CONFIG_USER_ONLY) > +typedef abi_ulong tb_page_addr_t; > +#define TB_PAGE_ADDR_FMT TARGET_ABI_FMT_lx > +#else > +typedef ram_addr_t tb_page_addr_t; > +#define TB_PAGE_ADDR_FMT RAM_ADDR_FMT > +#endif > + > #define CODE_GEN_HTABLE_BITS 15 > #define CODE_GEN_HTABLE_SIZE (1 << CODE_GEN_HTABLE_BITS) > > @@ -35,6 +46,7 @@ struct TBContext { > > /* statistics */ > unsigned tb_flush_count; > + struct qht tb_stats; > }; > > extern TBContext tb_ctx; > 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_u= long pc, uint32_t flags, > return qemu_xxhash7(phys_pc, pc, flags, cf_mask, trace_vcpu_dstate); > } > > +static inline > +uint32_t tb_stats_hash_func(tb_page_addr_t phys_pc, target_ulong pc, > + uint32_t flags) > +{ > + return qemu_xxhash5(phys_pc, pc, flags); > +} > + > #endif > 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; > > +int tcg_collect_tb_stats; > + > /* Return the number of characters emitted. */ > int qemu_log(const char *fmt, ...) > { -- Alex Benn=C3=A9e