From patchwork Wed Mar 6 14:40:35 2024 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: 778297 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:47:b0:33e:474f:8c56 with SMTP id k7csp324801wrx; Wed, 6 Mar 2024 06:41:37 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVQn0yks08db2HULvBmR1/Vnq3whRS3wJaR9SRN0FVGisHvmXEkhjCZi9NYuenzepOMqiwzWyLsNB/KfUY6BBOi X-Google-Smtp-Source: AGHT+IHAGr2vjHF4h7OnKdwD07Ro72BT/gXu272dnU39vDgeBOdkoEs9+L6mMhpscXJ2vhhQKnk7 X-Received: by 2002:a67:ce94:0:b0:472:6067:190c with SMTP id c20-20020a67ce94000000b004726067190cmr4556043vse.33.1709736097034; Wed, 06 Mar 2024 06:41:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709736097; cv=none; d=google.com; s=arc-20160816; b=kuAtSP9VOV7V6AwW6zGdcelfGNSWnpa9VTA0hUTrC+qsBOAnk/i+Rg27blBmH7M8ri qV/jqjdhE3sfXWeJTDTA2PVRxgowAYCBh2TXMBThRg7JPK5V3iGyb0tOQPXQ+cmbQFe1 SFxCBCzHly+HXj7b+3Od6fvkHZHn6hYVcyqXL0OntQE8gyZ3shbHDH2suanwLmV0BYvl 5FrYDlrsAPUAumlO5K3WaiC2kU7R9u69WPZDf0nBcb3S53GbnFtgwwX9k5xQxZazZFOo h9C80WMiq+Vp97DVdquF/Aj1DubcJ2CntNmwz+fK4ECufrMThLEuAdYDpZZAF0O1ciG1 n9Dw== 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=Khdy+gbq2WXrU2jPe9cQ5CJlDOdXdCS5sbUj4LPn044=; fh=tsEijvkx1NbT6Ur0mdaogUfqsbV1AR4G4GAX7WVZ83s=; b=sjrzmAnNFBPHlp73inhHZvsxoAMtvyanWiBmwQCAZbc7oy3pzhl2fI/CXj6ECRtLtr 02fTEdxDsdy6R6lvn9pCV8HJg6naJR/oLJ54uk+A7VPrI96Av2gfK13yQzKzMAMZ60Cg GjWEgIFwL1T/7M4qqTdfmMFe2TA2Oje2tvRTkyxLwFd9rSbnlEIAxjLmQQosE8/DFK8r 2k8T8GUPNupGO0PFx325xSqNv6F+Yy4NXLRxC8XfGX/8vltS8gj6Mx0lR12doB9xFWGk GGP+/fpUVpedf/wNAoP9mU461iXhuJqVjbMq92LOgesORF3qqL8rIPk2XnnDoPdq97ZU F0+g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JbZhFjaz; 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 fc7-20020a056130178700b007da615a3d42si2429596uab.29.2024.03.06.06.41.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 06 Mar 2024 06:41:37 -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=JbZhFjaz; 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 1rhsSJ-0008Nz-1m; Wed, 06 Mar 2024 09:41:15 -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 1rhsSD-0007wY-CL for qemu-devel@nongnu.org; Wed, 06 Mar 2024 09:41:09 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rhsS4-0001Ve-Bs for qemu-devel@nongnu.org; Wed, 06 Mar 2024 09:41:09 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-412e80e13abso22407995e9.3 for ; Wed, 06 Mar 2024 06:40:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709736058; x=1710340858; 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=Khdy+gbq2WXrU2jPe9cQ5CJlDOdXdCS5sbUj4LPn044=; b=JbZhFjazFhrTmQVIfvNvNq7U0fd2AU0/ZxucioIgS0QxdudOvkXwAf4Jj590CTQtbV lraZ/v9MJ4ERv1AymG86s0fuRN+VQyHUE1T1G3dQPyBZA2ty9Pf1G8N2bntYcr+nQONF QkJcyKpUNQOfIImt//K54y+ymfR/tCcgWiBhFXPPZOFQV7xL0KLSKqqI2Uigg7AA9XLE nRyHOQZCz0H8ksx1VPs2TpS4k/JwtwyvrZb7YNjgatpwqXnDIvgF/lMHdL+ByQfTqMpz KHo/SOukJ0EHmN2ABOAPd8a93ekfM8BdhJUEksIV0hmTdxm40kLL2sCa9/nEtHek260g 9pQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709736059; x=1710340859; 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=Khdy+gbq2WXrU2jPe9cQ5CJlDOdXdCS5sbUj4LPn044=; b=ucUF6k4zZBd699hAtHy85wAjtTjqqm7f5fwub/WNSeQovuueCHt3cRqLOoDo7HIhKs WCszwAfDSz5jLooX9X2r/9/tQMy6aXqzDlxF/s9KiJ74lhzUNkZPfkhwSIdLfmLHD3zE SIR2PgIZuRdp2xaqOcr39SNe2JO57azjT5M0oy+SFybGS+Mm39aV7MMJKaq+tutgqlK3 xfEMCzD5qsKTiGB5vxs3yfAcl+mgsr9JDAjxKJ7W5Yi8ATx/Cojexrhw9bH68sW+76bT 1AW2y3Hna9wdwdiXrj9ZsgrVL7opojsVJhdPejLK8xgCAvy3Os6AA2pd51hVVLnVey5g brqA== X-Gm-Message-State: AOJu0YyLgjNgX0r8Tb5pWUUuvQqUcYTPAVzMqdD10FPmefTQ2bvS2eAg URlT6UMVU/AzuDuHJBA2/aDNj0vWBkw7T5U1JmgD3DxRx75/rHxflKV8QuRRlW4= X-Received: by 2002:a05:600c:5252:b0:412:de1f:cdfb with SMTP id fc18-20020a05600c525200b00412de1fcdfbmr7342199wmb.20.1709736058567; Wed, 06 Mar 2024 06:40:58 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id hg7-20020a05600c538700b00412fe0eb806sm776226wmb.14.2024.03.06.06.40.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 06:40:54 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id A60D75F9E8; Wed, 6 Mar 2024 14:40:43 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Pierrick Bouvier , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Alexandre Iooss , Mahmoud Mandour Subject: [PULL 23/29] contrib/plugins/howvec: migrate to new per_vcpu API Date: Wed, 6 Mar 2024 14:40:35 +0000 Message-Id: <20240306144041.3787188-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240306144041.3787188-1-alex.bennee@linaro.org> References: <20240306144041.3787188-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.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, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=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 From: Pierrick Bouvier Reviewed-by: Alex Bennée Tested-by: Alex Bennée Signed-off-by: Pierrick Bouvier Message-Id: <20240304130036.124418-11-pierrick.bouvier@linaro.org> Signed-off-by: Alex Bennée Message-Id: <20240305121005.3528075-24-alex.bennee@linaro.org> diff --git a/contrib/plugins/howvec.c b/contrib/plugins/howvec.c index 644a7856bb2..2d10c87e0fb 100644 --- a/contrib/plugins/howvec.c +++ b/contrib/plugins/howvec.c @@ -43,13 +43,13 @@ typedef struct { uint32_t mask; uint32_t pattern; CountType what; - uint64_t count; + qemu_plugin_u64 count; } InsnClassExecCount; typedef struct { char *insn; uint32_t opcode; - uint64_t count; + qemu_plugin_u64 count; InsnClassExecCount *class; } InsnExecCount; @@ -159,7 +159,9 @@ static gint cmp_exec_count(gconstpointer a, gconstpointer b) { InsnExecCount *ea = (InsnExecCount *) a; InsnExecCount *eb = (InsnExecCount *) b; - return ea->count > eb->count ? -1 : 1; + uint64_t count_a = qemu_plugin_u64_sum(ea->count); + uint64_t count_b = qemu_plugin_u64_sum(eb->count); + return count_a > count_b ? -1 : 1; } static void free_record(gpointer data) @@ -167,12 +169,14 @@ static void free_record(gpointer data) InsnExecCount *rec = (InsnExecCount *) data; g_free(rec->insn); g_free(rec); + qemu_plugin_scoreboard_free(rec->count.score); } static void plugin_exit(qemu_plugin_id_t id, void *p) { g_autoptr(GString) report = g_string_new("Instruction Classes:\n"); int i; + uint64_t total_count; GList *counts; InsnClassExecCount *class = NULL; @@ -180,11 +184,12 @@ static void plugin_exit(qemu_plugin_id_t id, void *p) class = &class_table[i]; switch (class->what) { case COUNT_CLASS: - if (class->count || verbose) { + total_count = qemu_plugin_u64_sum(class->count); + if (total_count || verbose) { g_string_append_printf(report, "Class: %-24s\t(%" PRId64 " hits)\n", class->class, - class->count); + total_count); } break; case COUNT_INDIVIDUAL: @@ -212,7 +217,7 @@ static void plugin_exit(qemu_plugin_id_t id, void *p) "Instr: %-24s\t(%" PRId64 " hits)" "\t(op=0x%08x/%s)\n", rec->insn, - rec->count, + qemu_plugin_u64_sum(rec->count), rec->opcode, rec->class ? rec->class->class : "un-categorised"); @@ -221,6 +226,12 @@ static void plugin_exit(qemu_plugin_id_t id, void *p) } g_hash_table_destroy(insns); + for (i = 0; i < ARRAY_SIZE(class_tables); i++) { + for (int j = 0; j < class_tables[i].table_sz; ++j) { + qemu_plugin_scoreboard_free(class_tables[i].table[j].count.score); + } + } + qemu_plugin_outs(report->str); } @@ -232,11 +243,12 @@ static void plugin_init(void) static void vcpu_insn_exec_before(unsigned int cpu_index, void *udata) { - uint64_t *count = (uint64_t *) udata; - (*count)++; + struct qemu_plugin_scoreboard *score = udata; + qemu_plugin_u64_add(qemu_plugin_scoreboard_u64(score), cpu_index, 1); } -static uint64_t *find_counter(struct qemu_plugin_insn *insn) +static struct qemu_plugin_scoreboard *find_counter( + struct qemu_plugin_insn *insn) { int i; uint64_t *cnt = NULL; @@ -265,7 +277,7 @@ static uint64_t *find_counter(struct qemu_plugin_insn *insn) case COUNT_NONE: return NULL; case COUNT_CLASS: - return &class->count; + return class->count.score; case COUNT_INDIVIDUAL: { InsnExecCount *icount; @@ -279,13 +291,16 @@ static uint64_t *find_counter(struct qemu_plugin_insn *insn) icount->opcode = opcode; icount->insn = qemu_plugin_insn_disas(insn); icount->class = class; + struct qemu_plugin_scoreboard *score = + qemu_plugin_scoreboard_new(sizeof(uint64_t)); + icount->count = qemu_plugin_scoreboard_u64(score); g_hash_table_insert(insns, GUINT_TO_POINTER(opcode), (gpointer) icount); } g_mutex_unlock(&lock); - return &icount->count; + return icount->count.score; } default: g_assert_not_reached(); @@ -300,14 +315,14 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) size_t i; for (i = 0; i < n; i++) { - uint64_t *cnt; struct qemu_plugin_insn *insn = qemu_plugin_tb_get_insn(tb, i); - cnt = find_counter(insn); + struct qemu_plugin_scoreboard *cnt = find_counter(insn); if (cnt) { if (do_inline) { - qemu_plugin_register_vcpu_insn_exec_inline( - insn, QEMU_PLUGIN_INLINE_ADD_U64, cnt, 1); + qemu_plugin_register_vcpu_insn_exec_inline_per_vcpu( + insn, QEMU_PLUGIN_INLINE_ADD_U64, + qemu_plugin_scoreboard_u64(cnt), 1); } else { qemu_plugin_register_vcpu_insn_exec_cb( insn, vcpu_insn_exec_before, QEMU_PLUGIN_CB_NO_REGS, cnt); @@ -322,6 +337,14 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, { int i; + for (i = 0; i < ARRAY_SIZE(class_tables); i++) { + for (int j = 0; j < class_tables[i].table_sz; ++j) { + struct qemu_plugin_scoreboard *score = + qemu_plugin_scoreboard_new(sizeof(uint64_t)); + class_tables[i].table[j].count = qemu_plugin_scoreboard_u64(score); + } + } + /* Select a class table appropriate to the guest architecture */ for (i = 0; i < ARRAY_SIZE(class_tables); i++) { ClassSelector *entry = &class_tables[i];