From patchwork Thu Feb 29 05:25:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 776889 Delivered-To: patch@linaro.org Received: by 2002:adf:e94d:0:b0:33d:f458:43ce with SMTP id m13csp652166wrn; Wed, 28 Feb 2024 21:27:42 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWr9y77CzEWRS6QGl/zna8bP9KjLpZgwHozxOYlSRsEew55W/iygWtv3kMRjvonRJFHpU9TrNa1hv757tuwhuGJ X-Google-Smtp-Source: AGHT+IH/1Da6eCjIjZ/uAyi+enDvMlCc5xhKug67ReT2cu1EfrBWUAfEmNSJmVMgWLHkOHedl+/e X-Received: by 2002:a0c:fa11:0:b0:68f:5546:c7e8 with SMTP id q17-20020a0cfa11000000b0068f5546c7e8mr1219044qvn.48.1709184461968; Wed, 28 Feb 2024 21:27:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709184461; cv=none; d=google.com; s=arc-20160816; b=WOXRTjdFW1Pn7YLxSqLUdl8Pc4l23V7kbHY0nK5Eqe6U8S2tlNYhYMgktCFenC7zLF l8tBOl/H2hiJUe1ttuBZHFDkaYYpiSNDA3GEuFOGOKeIgyZ+SMD0IdW/veETXLH5AFUA MX7NxPn6Ed2LNrmFReHwkCgMg4vmpC48imK8ojztdtkmTd0pfwInTP7UIErPaNuq1cQF neha5OxnDtBjqqdC93QYpBbCpTVFQVtl0r6iMnsxMNEpIXHfi9g48jcaXKyzvoIkG+BO 01ggAwBIBu/OqcZCsqLFnEjjiW75t9C9XphV7ikx4LkFDQv4EtYHn6i1YI0/o6tHh+3p U4lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=RwJ8e6wUH7fqyic9sqG77ZVCFxcpo7vgFJo8+jFAkz0=; fh=nGClJJsVFmntY4VqdXC/iKBtyneNNRVjg3eop4mLm3Q=; b=0SJ9aRRnP+eMPu02o/hdBRgAkbCbhMvYygo5toVjBUc2p76RUNhWKjyWTW2ioVqY/j E17ng7+gYbwacrz50rW6SRl9h4lRmR2PPgcfgTKckofjE/n7ddi7X8IO/K1vje5JcD0p T7erMd0cR0W1gd/2BcTlhlVw5Vut1eiKMTfxDFruU8JdgBlOh/DFy/Tfvl2T3WV7fvxY wu0UBjcdiO0OhTdxyXA1UGsMuZxIQKusrbvFoNYI6xn1kAkqJDHNL5T1Mv4HyVifv9px ZCzchBgfnwDYczqDSSAOu6CWDs5oPWXsIon7z9Can5L+klRYworniBMY3ws8erzkU1FD TmQA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vQX8UFDb; 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=pass (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 jz1-20020a0562140e6100b0068fe8554c3csi689754qvb.86.2024.02.28.21.27.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Feb 2024 21:27:41 -0800 (PST) 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=pass header.i=@linaro.org header.s=google header.b=vQX8UFDb; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rfYva-0002oP-93; Thu, 29 Feb 2024 00:25:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rfYvY-0002ne-WB for qemu-devel@nongnu.org; Thu, 29 Feb 2024 00:25:53 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rfYvX-0005zu-Cy for qemu-devel@nongnu.org; Thu, 29 Feb 2024 00:25:52 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-412b98c9b2fso4018205e9.0 for ; Wed, 28 Feb 2024 21:25:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709184349; x=1709789149; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RwJ8e6wUH7fqyic9sqG77ZVCFxcpo7vgFJo8+jFAkz0=; b=vQX8UFDbQrfNOeUFlshmwZNp4x6SawUjMH0NAOlrfJqXL7+73bE8nWgfPI7Cky807T hX2d4wrEBscqiFNvSbk5ruTDGL6HxxmpndC1rVtwUux3Vu2KqtMH8tE4RBRD4J6IK3/3 aBoteYWoFfpO74qRZOHSMrxAH+9jTOb4gDyPiyMCKy58eEYBPInbdg6IPS3QtfHU9W4S tme4bLjKg3U7oI1EohxObDilR2WVo1koFiS9XGUWUNpHS4s9LogJJuUUdtKWCESJG1aF SSe8B55pSjj5PEQougbcbQpP4zarbUX2/Oe1PelkDaWJSLon/aHafzDJENzDHecRgA/c H4Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709184349; x=1709789149; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RwJ8e6wUH7fqyic9sqG77ZVCFxcpo7vgFJo8+jFAkz0=; b=EzulzV2hUhcmqCAXOHHdjt1lbXT3NFcgdI+O0M5XO8NcJCXYXyWUOB2iQz96TRPI5Q SPaIPhtr1E7Mh1bLiwTPOZ8Z6GLddjvoiXOqNx+bvgbuhwtUpzByBnfwQ3wab00U8oW3 RWzmGzcKltpLQ84WzPI7f/RKh8nV1iqbJH0VraVSoY+tUG5RD0Ys3FsVevVskTN4Advy +IU1j/FdEg1fSB/Rw5HCDF04xI2vWx3r9ZUyVrsat28EMURh2Hp1G/J+Axjgbw73JkqI HO37TdtGCEHkhNhI5kiK4WroJt1PGT3ndsFD1Z1Me7KS7C8Q4DhAak9gDuRCNC8lqUfL pmOA== X-Gm-Message-State: AOJu0Yw4rO8lc+qLOaOczFOEVmqTb2pbK3InhdHpiKpEcRKx3Mn6BFLw dkC49ZxLrwucdW2uNUH+cSKonMqDAjI9WXf0It/i58gdLpWK5oN0+BWZlqODmJRxRSFXsB4swmY aVgU= X-Received: by 2002:adf:fe51:0:b0:33d:a452:2fff with SMTP id m17-20020adffe51000000b0033da4522fffmr636091wrs.11.1709184349147; Wed, 28 Feb 2024 21:25:49 -0800 (PST) Received: from linaro.. ([102.35.208.160]) by smtp.gmail.com with ESMTPSA id e14-20020adffc4e000000b0033dfa7ecd33sm660241wrs.61.2024.02.28.21.25.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Feb 2024 21:25:48 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Mahmoud Mandour , Eduardo Habkost , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Yanan Wang , Pierrick Bouvier , Richard Henderson , Marcel Apfelbaum , Paolo Bonzini , Alexandre Iooss Subject: [PATCH v6 09/12] contrib/plugins/hotblocks: migrate to new per_vcpu API Date: Thu, 29 Feb 2024 09:25:03 +0400 Message-ID: <20240229052506.933222-10-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240229052506.933222-1-pierrick.bouvier@linaro.org> References: <20240229052506.933222-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=pierrick.bouvier@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Pierrick Bouvier --- contrib/plugins/hotblocks.c | 50 ++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/contrib/plugins/hotblocks.c b/contrib/plugins/hotblocks.c index 4de1b134944..02bc5078bdd 100644 --- a/contrib/plugins/hotblocks.c +++ b/contrib/plugins/hotblocks.c @@ -34,8 +34,8 @@ static guint64 limit = 20; */ typedef struct { uint64_t start_addr; - uint64_t exec_count; - int trans_count; + struct qemu_plugin_scoreboard *exec_count; + int trans_count; unsigned long insns; } ExecCount; @@ -43,7 +43,17 @@ static gint cmp_exec_count(gconstpointer a, gconstpointer b) { ExecCount *ea = (ExecCount *) a; ExecCount *eb = (ExecCount *) b; - return ea->exec_count > eb->exec_count ? -1 : 1; + uint64_t count_a = + qemu_plugin_u64_sum(qemu_plugin_scoreboard_u64(ea->exec_count)); + uint64_t count_b = + qemu_plugin_u64_sum(qemu_plugin_scoreboard_u64(eb->exec_count)); + return count_a > count_b ? -1 : 1; +} + +static void exec_count_free(gpointer key, gpointer value, gpointer user_data) +{ + ExecCount *cnt = value; + qemu_plugin_scoreboard_free(cnt->exec_count); } static void plugin_exit(qemu_plugin_id_t id, void *p) @@ -52,7 +62,6 @@ static void plugin_exit(qemu_plugin_id_t id, void *p) GList *counts, *it; int i; - g_mutex_lock(&lock); g_string_append_printf(report, "%d entries in the hash table\n", g_hash_table_size(hotblocks)); counts = g_hash_table_get_values(hotblocks); @@ -63,16 +72,21 @@ static void plugin_exit(qemu_plugin_id_t id, void *p) for (i = 0; i < limit && it->next; i++, it = it->next) { ExecCount *rec = (ExecCount *) it->data; - g_string_append_printf(report, "0x%016"PRIx64", %d, %ld, %"PRId64"\n", - rec->start_addr, rec->trans_count, - rec->insns, rec->exec_count); + g_string_append_printf( + report, "0x%016"PRIx64", %d, %ld, %"PRId64"\n", + rec->start_addr, rec->trans_count, + rec->insns, + qemu_plugin_u64_sum( + qemu_plugin_scoreboard_u64(rec->exec_count))); } g_list_free(it); } - g_mutex_unlock(&lock); qemu_plugin_outs(report->str); + + g_hash_table_foreach(hotblocks, exec_count_free, NULL); + g_hash_table_destroy(hotblocks); } static void plugin_init(void) @@ -82,15 +96,9 @@ static void plugin_init(void) static void vcpu_tb_exec(unsigned int cpu_index, void *udata) { - ExecCount *cnt; - uint64_t hash = (uint64_t) udata; - - g_mutex_lock(&lock); - cnt = (ExecCount *) g_hash_table_lookup(hotblocks, (gconstpointer) hash); - /* should always succeed */ - g_assert(cnt); - cnt->exec_count++; - g_mutex_unlock(&lock); + ExecCount *cnt = (ExecCount *)udata; + qemu_plugin_u64_add(qemu_plugin_scoreboard_u64(cnt->exec_count), + cpu_index, 1); } /* @@ -114,18 +122,20 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) cnt->start_addr = pc; cnt->trans_count = 1; cnt->insns = insns; + cnt->exec_count = qemu_plugin_scoreboard_new(sizeof(uint64_t)); g_hash_table_insert(hotblocks, (gpointer) hash, (gpointer) cnt); } g_mutex_unlock(&lock); if (do_inline) { - qemu_plugin_register_vcpu_tb_exec_inline(tb, QEMU_PLUGIN_INLINE_ADD_U64, - &cnt->exec_count, 1); + qemu_plugin_register_vcpu_tb_exec_inline_per_vcpu( + tb, QEMU_PLUGIN_INLINE_ADD_U64, + qemu_plugin_scoreboard_u64(cnt->exec_count), 1); } else { qemu_plugin_register_vcpu_tb_exec_cb(tb, vcpu_tb_exec, QEMU_PLUGIN_CB_NO_REGS, - (void *)hash); + (void *)cnt); } }