From patchwork Mon Oct 7 15:28:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 175352 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4446679ill; Mon, 7 Oct 2019 08:39:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqxHI0bAJPbDf28n1OWo8koihkB+MtMc2Kha7G5ooEPV5CoyWzORNKV/mjmUT25p+hXbDcov X-Received: by 2002:a0c:d7cf:: with SMTP id g15mr27820952qvj.73.1570462778926; Mon, 07 Oct 2019 08:39:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570462778; cv=none; d=google.com; s=arc-20160816; b=zULokAJQxK40mugiHG4j99KleG3rFquk59Qxm49yjkkPTrAXu+8R5FBn0QZDetsFKb Wa0Qz4xW1teE0lMXWCmQY3JeBj+0heOXmH4zefzErjCITiAfIGTBfazrV31lveIfxMOz zQzoQHudLhXkJGM2Hc+rk1WOlJd5qrEl+R+WwL8q5frIOxCpGd8fU7RbL6uKSQ8Tc5D3 nvHUzjGUWuE8lq1ggn+gx1mCQy+MWu93mkbnnIRiQpBW6bHAI8E9Ux92gRK+MUWPjNIA S37myLA519RAhFwrhOFL0WEo2L4IhMwO+TGo2vqVT/aW10W21jt0cQHb38N0z4cTv6Gb chAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=CZflwldCN50YlIobs9aZPRkYZvox2aKMETtZiJDlL04=; b=P6aXDUFQcUHKXO7Gb/hwibW7MCHEsRDqcymhktOs2Rg3/BV4WMZnDdpNoMWpT1mExB PLnAkhZ9uZol5Dwbi9kQjH6A41qooHBDZeELm/og6i+9W8XFwMYBChtShCbqL7bHD0q3 U8LPKAnUn3XhGMmPEnZJSSNYNJ55XgRPvQtaTDGwn2cWb1T9KAa4yXrBx58tMxRz0qxD 6oJRTJW9qec6st+FrHLe8pBLQL8TgNsApZ64FTEQcm6hQa0UMOokpKlEU15xRBgxjY7J 7uv31Uacjazqcr4UcgEuX0Al9kaYwczDYeHZTObRQUPJ5Iv+ppaYyWG3KCR09uMsBzb7 XS9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Jh6uQSbP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d126si12110158qkf.252.2019.10.07.08.39.38 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 07 Oct 2019 08:39:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Jh6uQSbP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46314 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iHV6n-0002ZY-Mv for patch@linaro.org; Mon, 07 Oct 2019 11:39:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48914) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iHUwL-0002bb-IE for qemu-devel@nongnu.org; Mon, 07 Oct 2019 11:28:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iHUwJ-0005Ax-9h for qemu-devel@nongnu.org; Mon, 07 Oct 2019 11:28:49 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:46902) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iHUwJ-0005AX-26 for qemu-devel@nongnu.org; Mon, 07 Oct 2019 11:28:47 -0400 Received: by mail-wr1-x441.google.com with SMTP id o18so15792748wrv.13 for ; Mon, 07 Oct 2019 08:28:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CZflwldCN50YlIobs9aZPRkYZvox2aKMETtZiJDlL04=; b=Jh6uQSbPiW9SkfOV7aWHBCqRVLBjouaO2LvT2ceUjv8vNEhYteiEwrPaUJepb+3iYV qcm4UAl6I3xVRDO8dArXqvvlL5jXbpmJQFd46BbVKin6RkKXHwn+/4BQbwwEuJjq/Jf0 QiLpVy4o7c3a72/anHsM9aoP2rADBcFtwkIQctnndm15OoIhE3i8kxMTziMeF6MDiqOZ P429D8MP5ydXqPHPKm3AVeICIkJ9oI2zSTXHzKqBrbfpq+0279SArQ4u0Ffnmmd988lD uFkrvbaGzIKhn0GvHI/c2ZnuNQngMDT6EgH/mQqYu4xNU/xA8iLhizNFmw7z4S6KV3wM 5YSQ== 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=CZflwldCN50YlIobs9aZPRkYZvox2aKMETtZiJDlL04=; b=Qsz98eO57OhOEsjASGXJYa6vds9lVCnlpgWQEaOCe/1Ib5u+1MypfSv73gNORbsuvf b5sbQg9yzR62o0aWhKlkSpGRtYk6rWmqF+mFHUqdddfW4sInX0vnTpKDuT9dlMDoZvDs TBGoYjO4uigEw3zgURCFO4alOSCVgR2mdf9RqTERsLhYGlQffd97yHv4ToCtbcVdb2GD wX7ZFqie5uPYc2c4kmNp0E1/CKn8rS2z2gUt11zXDvqcDqmn8CCzuYWC5w8BFATPlir+ 1/MCHcdAJ3uHzOKPEpw+/9sSIgGvum1uxhoBeYB7i9NHbfOYKQDCjlYvKEH/UOtv97Sr pYQA== X-Gm-Message-State: APjAAAWKnKX0Tpq88J6ONRlnU55PRF75sCmAVJ3B5kQZQeJfvj0fsi4F Ja6mmz7ccF+dB5avcNEOHhNebA== X-Received: by 2002:adf:e588:: with SMTP id l8mr8571883wrm.290.1570462125933; Mon, 07 Oct 2019 08:28:45 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a14sm15301444wmm.44.2019.10.07.08.28.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 08:28:42 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0CA6C1FF96; Mon, 7 Oct 2019 16:28:40 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v9 07/13] monitor: adding tb_stats hmp command Date: Mon, 7 Oct 2019 16:28:33 +0100 Message-Id: <20191007152839.30804-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191007152839.30804-1-alex.bennee@linaro.org> References: <20191007152839.30804-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 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: "Vanderson M. do Rosario" , "Dr . David Alan Gilbert" , Markus Armbruster , cota@braap.org, Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: "Vanderson M. do Rosario" 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 Message-Id: <20190829173437.5926-8-vandersonmr2@gmail.com> [AJB: fix authorship] Signed-off-by: Alex Bennée monitor: add 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 Message-Id: <20190829173437.5926-9-vandersonmr2@gmail.com> [AJB: fix authorship] Signed-off-by: Alex Bennée --- accel/tcg/tb-stats.c | 105 ++++++++++++++++++++++++++++++++++ hmp-commands.hx | 17 ++++++ include/exec/tb-stats-flags.h | 1 + include/exec/tb-stats.h | 10 ++++ monitor/misc.c | 49 ++++++++++++++++ vl.c | 6 ++ 6 files changed, 188 insertions(+) -- 2.20.1 diff --git a/accel/tcg/tb-stats.c b/accel/tcg/tb-stats.c index 1c66e03979..dabc5150f9 100644 --- a/accel/tcg/tb-stats.c +++ b/accel/tcg/tb-stats.c @@ -26,6 +26,8 @@ enum TBStatsStatus { static enum TBStatsStatus tcg_collect_tb_stats; static uint32_t default_tbstats_flag; +/* only accessed in safe work */ +static GList *last_search; uint64_t dev_time; @@ -155,6 +157,96 @@ void dump_jit_profile_info(TCGProfile *s) g_free(jpi); } +static void free_tbstats(void *p, uint32_t hash, void *userp) +{ + g_free(p); +} + +static void clean_tbstats(void) +{ + /* remove all tb_stats */ + qht_iter(&tb_ctx.tb_stats, free_tbstats, NULL); + qht_destroy(&tb_ctx.tb_stats); +} + +void do_hmp_tbstats_safe(CPUState *cpu, run_on_cpu_data icmd) +{ + struct TbstatsCommand *cmdinfo = icmd.host_ptr; + int cmd = cmdinfo->cmd; + uint32_t level = cmdinfo->level; + + switch (cmd) { + case START: + if (tb_stats_collection_paused()) { + set_tbstats_flags(level); + } else { + if (tb_stats_collection_enabled()) { + qemu_printf("TB information already being recorded"); + return; + } + qht_init(&tb_ctx.tb_stats, tb_stats_cmp, CODE_GEN_HTABLE_SIZE, + QHT_MODE_AUTO_RESIZE); + } + + set_default_tbstats_flag(level); + enable_collect_tb_stats(); + tb_flush(cpu); + break; + case PAUSE: + if (!tb_stats_collection_enabled()) { + qemu_printf("TB information not being recorded"); + return; + } + + /* Continue to create TBStatistic structures but stop collecting statistics */ + pause_collect_tb_stats(); + set_default_tbstats_flag(TB_NOTHING); + set_tbstats_flags(TB_PAUSED); + tb_flush(cpu); + break; + case STOP: + if (!tb_stats_collection_enabled()) { + qemu_printf("TB information not being recorded"); + return; + } + + /* Dissalloc all TBStatistics structures and stop creating new ones */ + disable_collect_tb_stats(); + clean_tbstats(); + tb_flush(cpu); + break; + case FILTER: + if (!tb_stats_collection_enabled()) { + qemu_printf("TB information not being recorded"); + return; + } + if (!last_search) { + qemu_printf("no search on record! execute info tbs before filtering!"); + return; + } + + set_default_tbstats_flag(TB_NOTHING); + + /* Set all tbstats as paused, then return only the ones from last_search */ + pause_collect_tb_stats(); + set_tbstats_flags(TB_PAUSED); + + for (GList *iter = last_search; iter; iter = g_list_next(iter)) { + TBStatistics *tbs = iter->data; + tbs->stats_enabled = level; + } + + tb_flush(cpu); + + break; + default: /* INVALID */ + g_assert_not_reached(); + break; + } + + g_free(cmdinfo); +} + void init_tb_stats_htable_if_not(void) { if (tb_stats_collection_enabled() && !tb_ctx.tb_stats.map) { @@ -189,6 +281,19 @@ bool tb_stats_collection_paused(void) return tcg_collect_tb_stats == TB_STATS_PAUSED; } +static void reset_tbstats_flag(void *p, uint32_t hash, void *userp) +{ + uint32_t flag = *((int *)userp); + TBStatistics *tbs = p; + tbs->stats_enabled = flag; +} + +void set_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 cfcc044ce4..6cd2800378 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1886,6 +1886,23 @@ STEXI @findex qemu-io Executes a qemu-io command on the given block device. +ETEXI +#if defined(CONFIG_TCG) + { + .name = "tb_stats", + .args_type = "command:s,level:s?", + .params = "command [stats_level]", + .help = "Control tb statistics collection:" + "tb_stats (start|pause|stop|filter) [all|jit_stats|exec_stats]", + .cmd = hmp_tbstats, + }, +#endif + +STEXI +@item tb_stats +@findex +Control recording tb statistics + ETEXI { diff --git a/include/exec/tb-stats-flags.h b/include/exec/tb-stats-flags.h index 8455073048..252304d685 100644 --- a/include/exec/tb-stats-flags.h +++ b/include/exec/tb-stats-flags.h @@ -15,6 +15,7 @@ #define TB_EXEC_STATS (1 << 1) #define TB_JIT_STATS (1 << 2) #define TB_JIT_TIME (1 << 3) +#define TB_PAUSED (1 << 4) /* TBStatistic collection controls */ void enable_collect_tb_stats(void); diff --git a/include/exec/tb-stats.h b/include/exec/tb-stats.h index 019d316f5c..921da38c97 100644 --- a/include/exec/tb-stats.h +++ b/include/exec/tb-stats.h @@ -32,6 +32,9 @@ #include "exec/tb-stats-flags.h" +enum SortBy { SORT_BY_HOTNESS, SORT_BY_HG /* Host/Guest */, SORT_BY_SPILLS }; +enum TbstatsCmd { START, PAUSE, STOP, FILTER }; + #define tb_stats_enabled(tb, JIT_STATS) \ (tb && tb->tb_stats && (tb->tb_stats->stats_enabled & JIT_STATS)) @@ -115,4 +118,11 @@ void init_tb_stats_htable_if_not(void); void dump_jit_profile_info(TCGProfile *s); +struct TbstatsCommand { + enum TbstatsCmd cmd; + uint32_t level; +}; + +void do_hmp_tbstats_safe(CPUState *cpu, run_on_cpu_data icmd); + #endif diff --git a/monitor/misc.c b/monitor/misc.c index ac4ff58d96..218263d29a 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" #if defined(TARGET_S390X) #include "hw/s390x/storage-keys.h" @@ -459,6 +461,49 @@ static void hmp_info_registers(Monitor *mon, const QDict *qdict) } #ifdef CONFIG_TCG +static void hmp_tbstats(Monitor *mon, const QDict *qdict) +{ + if (!tcg_enabled()) { + error_report("TB information is only available with accel=tcg"); + return; + } + + char *cmd = (char *) qdict_get_try_str(qdict, "command"); + enum TbstatsCmd icmd = -1; + + if (strcmp(cmd, "start") == 0) { + icmd = START; + } else if (strcmp(cmd, "pause") == 0) { + icmd = PAUSE; + } else if (strcmp(cmd, "stop") == 0) { + icmd = STOP; + } else if (strcmp(cmd, "filter") == 0) { + icmd = FILTER; + } else { + error_report("invalid command!"); + return; + } + + char *slevel = (char *) qdict_get_try_str(qdict, "level"); + uint32_t level = TB_EXEC_STATS | TB_JIT_STATS | TB_JIT_TIME; + if (slevel) { + if (strcmp(slevel, "jit") == 0) { + level = TB_JIT_STATS; + } else if (strcmp(slevel, "exec") == 0) { + level = TB_EXEC_STATS; + } else if (strcmp(slevel, "time") == 0) { + level = TB_JIT_TIME; + } + } + + struct TbstatsCommand *tbscommand = g_new0(struct TbstatsCommand, 1); + tbscommand->cmd = icmd; + tbscommand->level = level; + async_safe_run_on_cpu(first_cpu, do_hmp_tbstats_safe, + RUN_ON_CPU_HOST_PTR(tbscommand)); + +} + 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) static void hmp_info_profile(Monitor *mon, const QDict *qdict) { +#ifdef CONFIG_TCG dump_jit_exec_time_info(dev_time); dev_time = 0; +#else + error_report("TCG should be enabled!"); +#endif } /* Capture support */ diff --git a/vl.c b/vl.c index f91bc6fb4c..781fddaf18 100644 --- a/vl.c +++ b/vl.c @@ -1796,11 +1796,17 @@ static bool main_loop_should_exit(void) static void main_loop(void) { +#ifdef CONFIG_TCG uint64_t ti; +#endif while (!main_loop_should_exit()) { +#ifdef CONFIG_TCG ti = profile_getclock(); +#endif main_loop_wait(false); +#ifdef CONFIG_TCG dev_time += profile_getclock() - ti; +#endif } }