From nobody Mon Feb 9 10:58:27 2026 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=1567097554; cv=none; d=zoho.com; s=zohoarc; b=PNMwuu9bxtR/X/dF9upaOtnHs5V2+lrYn3zWMKQJSjsUD/ZQB5fTgV0i7latnWRTy4n+qa+il4aMvdXFsGNEf67rBP300lz2wtOC2Pz5u81fao2lW6y1yR0JKerDsEqY7KsuMEgDxqUDbXwBEYDnoAE7hbCCjfjS7p9pwd/2Vno= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567097554; 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=Ype+RhMQ6yuP+PwkChrUABRIauIUwsULdkVXVz2HWbA=; b=PAvHGzLsOs4rOJa9Ccvtpxo0pqSV4bJUN26LK1hVBmVdybgRGwEsC8L7MPK35lY+x3lNJdNSKV0QJGPvKUuOGe0eQYYvjQ3VpNKqugu8nEfpnI/1FtTRfbKAsjD/9Z+xHzb8jpXUGir3opDDYx7ceLSa+XNeSiO1yJf0N8JzPKE= 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 1567097554587747.8712556679818; Thu, 29 Aug 2019 09:52:34 -0700 (PDT) Received: from localhost ([::1]:52062 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i3Ney-0002Xm-Ni for importer@patchew.org; Thu, 29 Aug 2019 12:52:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46471) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i3Naz-0006KX-Jq for qemu-devel@nongnu.org; Thu, 29 Aug 2019 12:48:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i3Nay-0006Gq-0S for qemu-devel@nongnu.org; Thu, 29 Aug 2019 12:48:25 -0400 Received: from mail-qt1-x843.google.com ([2607:f8b0:4864:20::843]:39018) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i3Nax-0006GI-SJ for qemu-devel@nongnu.org; Thu, 29 Aug 2019 12:48:23 -0400 Received: by mail-qt1-x843.google.com with SMTP id n7so4411679qtb.6 for ; Thu, 29 Aug 2019 09:48:23 -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 g25sm1441024qkk.87.2019.08.29.09.48.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Aug 2019 09:48:22 -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=Ype+RhMQ6yuP+PwkChrUABRIauIUwsULdkVXVz2HWbA=; b=HNhm4SoVmjnHxdjw6QxYKlFzH0pkT/tD0t6uHxmswbEZ1dApTArSaXc3bfdtYbXopw /QJsA+XzcoZmUCTgx5+9d3aQmYEVm4Npmzyelsuaugcs/Tqo0dDW+D+sBRRny3P4RgB9 KvcInx7MH1j8KHk7gkQ6ivChn8wyPFmckMgsQ5WX1Xyk9P2t2Ti4RNM9CDKdsV7mlqV5 0I6oTcXpxxaYLV8k5ui20Xd98I6E2f6ysArsgr4BM0/3TbpiOQyAXhKTMfObBadyiN+i XlFxhSyJfoG4WFFddHuU13VtG19QVFQGCUDupI1c/RoHeWUuI2IFxYl0crR5zTDNGKOf 4I/w== 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=Ype+RhMQ6yuP+PwkChrUABRIauIUwsULdkVXVz2HWbA=; b=cq1Ad8ljrdIvdmTBwwQCiq4OZnld/iOON50XdZiQabpQcA7qibHLWWdN3p44i7audD 0cawR8z4eQrYY6cR6Igt3sQyUJf2lMb5Rq81Rll156wA9LvJrHuiXeQ/iTb0AuTclpZN Gsl1ZWbbjKh98m0shGtPYCnKyvYLXrBPyAKRvxc6LEN/61T0veVaU4+O51vg2kxQvaW4 Vp+QmcQPpcVN4fkd70GCpc/d71wfaMT9NLm3J4AVLZt0zRc48pBV6xhMqScPQsHbfT+f vBacxuu1R4MEJ3Haar18c1EdoUlUWQZoC4VLpVSDo+rpa9LCBP5hm7Tpcv3ZFBtfEfjf EvGg== X-Gm-Message-State: APjAAAV9RC6s/W7Y0X6GHY8wXrTub1c1TT1OhQVzdhaR13Sha60xteey h2w21cO67kfHpPAwgnGaNltmMwNnwFx9lg== X-Google-Smtp-Source: APXvYqyiZJ00XnTEfmc9gAEpMdyKFnsamy8uXAgAx1GIOgqpPHsVGB1IfcOvc9NWvAWUqhxSuVPFDA== X-Received: by 2002:ad4:496b:: with SMTP id p11mr3433868qvy.29.1567097302936; Thu, 29 Aug 2019 09:48:22 -0700 (PDT) From: vandersonmr To: qemu-devel@nongnu.org Date: Thu, 29 Aug 2019 13:47:49 -0300 Message-Id: <20190829164754.3906-6-vandersonmr2@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190829164754.3906-1-vandersonmr2@gmail.com> References: <20190829164754.3906-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::843 Subject: [Qemu-devel] [PATCH v7 05/10] Adding -d tb_stats to control TBStatistics collection: 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: vandersonmr 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" -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 --- include/exec/gen-icount.h | 1 + include/exec/tb-stats-flags.h | 42 +++++++++++++++++++++++++++++++++++ include/exec/tb-stats.h | 18 +++------------ include/qemu/log.h | 1 + util/log.c | 35 +++++++++++++++++++++++++++++ 5 files changed, 82 insertions(+), 15 deletions(-) create mode 100644 include/exec/tb-stats-flags.h diff --git a/include/exec/gen-icount.h b/include/exec/gen-icount.h index be006383b9..3987adfb0e 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 "tb-stats-flags.h" =20 /* Helpers for instruction counting code generation. */ =20 diff --git a/include/exec/tb-stats-flags.h b/include/exec/tb-stats-flags.h new file mode 100644 index 0000000000..c936ac1084 --- /dev/null +++ b/include/exec/tb-stats-flags.h @@ -0,0 +1,42 @@ +/* + * QEMU System Emulator, Code Quality Monitor System + * + * Copyright (c) 2019 Vanderson M. do Rosario + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included= in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. + */ +#ifndef TB_STATS_FLAGS +#define TB_STATS_FLAGS + +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/exec/tb-stats.h b/include/exec/tb-stats.h index 0b9a6e2f72..6a53bef31b 100644 --- a/include/exec/tb-stats.h +++ b/include/exec/tb-stats.h @@ -30,6 +30,8 @@ #include "exec/tb-context.h" #include "tcg.h" =20 +#include "exec/tb-stats-flags.h" + #define tb_stats_enabled(tb, JIT_STATS) \ (tb && tb->tb_stats && (tb->tb_stats->stats_enabled & JIT_STATS)) =20 @@ -98,26 +100,12 @@ 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 /* 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_TIME (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/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/util/log.c b/util/log.c index 29021a4584..c3805b331b 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 "exec/tb-stats-flags.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