From patchwork Mon Feb 26 09:14:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 775847 Delivered-To: patch@linaro.org Received: by 2002:a5d:6103:0:b0:33d:da16:65b6 with SMTP id v3csp234119wrt; Mon, 26 Feb 2024 01:17:12 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWFz8wDYNIqowA61HXeDTCTohX7MYCe3VASvxLQdoeKqQdGnTpLQG2WTk/X5dxmQ/wHPukh2NUVV5WSbPXs6w09 X-Google-Smtp-Source: AGHT+IGCgRouNS/NuQtOusKDTVNVsWUeGm8YI7eKEDRYssJC7VV9nMJ1Yg1zL2ZVP6nLHOAbgaa8 X-Received: by 2002:a05:6214:3d0d:b0:68f:f9a8:45e2 with SMTP id ol13-20020a0562143d0d00b0068ff9a845e2mr7044808qvb.24.1708939032558; Mon, 26 Feb 2024 01:17:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708939032; cv=none; d=google.com; s=arc-20160816; b=QVccBw56WIq+0iveRp88P0ZmjqEM1ZCr1ARERlnnzmBwvD/n/eSVM7YLYPwbtXafIM mJAL8vB05JONzas26obhXgn99zaQnlv9yq8AN6NgqaSTTK6luKRGOc28l23kAUBBgLeH hrTGceDVR9oIqaT9U0HuCaRZZwIKrIZhq1ivD38NUWwW40ygLG4pPdkfVXISbCkXcRht YuWEehhh8iJFpYluqWCLvt85ymeVCybkGass5M4Y/iAPmnVSLEP9a0kVGRAMggyEVx6q 3gmRY7JYQgfkLCuvN8MNvN0SwcAILa0m45eVeZ/AMGn9WX0KYJDmuQRXpF+oIIhtEfD8 pztw== 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=vpn7ZrX++QOMXIPnhSOuAzbdhuGwGNkpxbx03u36x+U=; fh=l9WWdDUrM2GgKqlI4LjrMx7cGq7hKMPQ4FaYC0/RjNA=; b=G9dI1oiv+gUCuWKuBeoXs01Ts1GylJr7OeiRK7XokqTle6gR+RM+Gfw7w216LW5ZlR Yg5fUVUevyoTiSjIQfs1kbIbD761CUxiAPkQV/QEsQIzUlx6CItUzaTXMfDaJCBjcQxn bPTw29tJOl2yAHhhLUK/NW/jRBR7YGLlJOl6CVG2OHKuO+2mZS4C/3n+Dypd0lwEn3Hp zLZFTanxi5nVgXoWw+UxkbiFEkN8UeeSLiNq1iZLWvdDZh9npCuGUE4WKKRoE3RxlwPC 1YxVrN//wwpIdKN8RJMR+dwgtZ6/Yk4z6BjBWY3Bw/FAh7gPn7pAXjwEV2fkMuuFyPpy vQyg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=C6bPY0mk; 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 gg5-20020a056214252500b0068ed5f45265si4728801qvb.475.2024.02.26.01.17.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Feb 2024 01:17:12 -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=C6bPY0mk; 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 1reX5A-0004LA-9Z; Mon, 26 Feb 2024 04:15:32 -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 1reX57-0004KH-Au for qemu-devel@nongnu.org; Mon, 26 Feb 2024 04:15:29 -0500 Received: from mail-lj1-x236.google.com ([2a00:1450:4864:20::236]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1reX55-0005DC-Ld for qemu-devel@nongnu.org; Mon, 26 Feb 2024 04:15:29 -0500 Received: by mail-lj1-x236.google.com with SMTP id 38308e7fff4ca-2d21a68dd3bso37996661fa.1 for ; Mon, 26 Feb 2024 01:15:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708938925; x=1709543725; 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=vpn7ZrX++QOMXIPnhSOuAzbdhuGwGNkpxbx03u36x+U=; b=C6bPY0mkiSMBrJ/QRKxCECQiF36DK6zJg2ufLh4BH7tFAEo6n2Xure9AnQfEaUk3Bw sg6gaphAZOFu7nowS88kX2PubG/sgqq+id7oO61PNjRWlSraX40hvtS2yGchGfVYgWPQ S+48WcROCPefo4C7NzhVGD7vvZFMkvXFuGzSQRJFb2TkHZpa65h+WzmAXInItWPBzaBl 9ZTry/T+C8WqNxqe7FRXOiaKrv4pR5Cq85AOEVKzfaBmFoSF7oOij+45mm8+hM0r7rlo zwsxdsziHwN7VdjufvtVJWh/lnLAhWmGO++WtiZpnwQVcqKWEgsmKBpYY9NvAvDstiKA pu6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708938925; x=1709543725; 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=vpn7ZrX++QOMXIPnhSOuAzbdhuGwGNkpxbx03u36x+U=; b=SVoLrDR1sbgprSQWlh42hsLazTYQJUCbzKq7iUAteYxBpSCv6PDhrjgQREr3jMeSge oWuS2piOXIQKW4ChPzDhrI6fjgLRELLhCMl7+AGQ7vWW03rJu6QE6zBh9e8DxjZP/nm7 I8JByH1IxrQW/yjEwcQFZrHjSActc9yxUUcrmVouyLxdij+SdqQTKNkyG1Z/cSngq5cl thwOwtvGNH9KMLniXrnQ3ZYd3sqnkgk30nMAxFGA8G32MT4p0U9/bjKfvKF/TzzNJkgt fjc/IP9MnZUdUirtX/47IldJcL+eb0/YhOEr5Nr7sstVZbjsP/mWYgL707oOIpc8YEXJ RZcg== X-Gm-Message-State: AOJu0YzYnkQXYaZkDHeF/9OMpUmeGJ+JfphUgO+Yg5dsonm0x3INny4T tIAeeeqSjwr1Js8M9s/XVl8hVlq5594vdjVUeqaLeid3Bcdl2H1s8/bnGEkGJwtyfFnMD3Pd+FI 0dYZ5jw== X-Received: by 2002:a2e:b170:0:b0:2d2:4cb2:59e4 with SMTP id a16-20020a2eb170000000b002d24cb259e4mr3894689ljm.31.1708938925534; Mon, 26 Feb 2024 01:15:25 -0800 (PST) Received: from linaro.. ([102.35.208.160]) by smtp.gmail.com with ESMTPSA id g7-20020adfe407000000b0033d2ae84fafsm7578814wrm.52.2024.02.26.01.15.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 01:15:25 -0800 (PST) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Marcel Apfelbaum , Pierrick Bouvier , Yanan Wang , Paolo Bonzini , Mahmoud Mandour , Alexandre Iooss , =?utf-8?q?Alex_Benn=C3=A9e?= , Eduardo Habkost Subject: [PATCH v5 08/12] tests/plugin/bb: migrate to new per_vcpu API Date: Mon, 26 Feb 2024 13:14:40 +0400 Message-ID: <20240226091446.479436-9-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240226091446.479436-1-pierrick.bouvier@linaro.org> References: <20240226091446.479436-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::236; envelope-from=pierrick.bouvier@linaro.org; helo=mail-lj1-x236.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 Reviewed-by: Luc Michel Reviewed-by: Alex Bennée --- tests/plugin/bb.c | 63 +++++++++++++++++++---------------------------- 1 file changed, 26 insertions(+), 37 deletions(-) diff --git a/tests/plugin/bb.c b/tests/plugin/bb.c index df50d1fd3bc..36776dee1e1 100644 --- a/tests/plugin/bb.c +++ b/tests/plugin/bb.c @@ -17,27 +17,25 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_version = QEMU_PLUGIN_VERSION; typedef struct { - GMutex lock; - int index; uint64_t bb_count; uint64_t insn_count; } CPUCount; -/* Used by the inline & linux-user counts */ +static struct qemu_plugin_scoreboard *counts; +static qemu_plugin_u64 bb_count; +static qemu_plugin_u64 insn_count; + static bool do_inline; -static CPUCount inline_count; - /* Dump running CPU total on idle? */ static bool idle_report; -static GPtrArray *counts; -static int max_cpus; -static void gen_one_cpu_report(CPUCount *count, GString *report) +static void gen_one_cpu_report(CPUCount *count, GString *report, + unsigned int cpu_index) { if (count->bb_count) { g_string_append_printf(report, "CPU%d: " "bb's: %" PRIu64", insns: %" PRIu64 "\n", - count->index, + cpu_index, count->bb_count, count->insn_count); } } @@ -46,20 +44,23 @@ static void plugin_exit(qemu_plugin_id_t id, void *p) { g_autoptr(GString) report = g_string_new(""); - if (do_inline || !max_cpus) { - g_string_printf(report, "bb's: %" PRIu64", insns: %" PRIu64 "\n", - inline_count.bb_count, inline_count.insn_count); - } else { - g_ptr_array_foreach(counts, (GFunc) gen_one_cpu_report, report); + for (int i = 0; i < qemu_plugin_num_vcpus(); ++i) { + CPUCount *count = qemu_plugin_scoreboard_find(counts, i); + gen_one_cpu_report(count, report, i); } + g_string_append_printf(report, "Total: " + "bb's: %" PRIu64", insns: %" PRIu64 "\n", + qemu_plugin_u64_sum(bb_count), + qemu_plugin_u64_sum(insn_count)); qemu_plugin_outs(report->str); + qemu_plugin_scoreboard_free(counts); } static void vcpu_idle(qemu_plugin_id_t id, unsigned int cpu_index) { - CPUCount *count = g_ptr_array_index(counts, cpu_index); + CPUCount *count = qemu_plugin_scoreboard_find(counts, cpu_index); g_autoptr(GString) report = g_string_new(""); - gen_one_cpu_report(count, report); + gen_one_cpu_report(count, report, cpu_index); if (report->len > 0) { g_string_prepend(report, "Idling "); @@ -69,14 +70,11 @@ static void vcpu_idle(qemu_plugin_id_t id, unsigned int cpu_index) static void vcpu_tb_exec(unsigned int cpu_index, void *udata) { - CPUCount *count = max_cpus ? - g_ptr_array_index(counts, cpu_index) : &inline_count; + CPUCount *count = qemu_plugin_scoreboard_find(counts, cpu_index); uintptr_t n_insns = (uintptr_t)udata; - g_mutex_lock(&count->lock); count->insn_count += n_insns; count->bb_count++; - g_mutex_unlock(&count->lock); } static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) @@ -84,11 +82,10 @@ static void vcpu_tb_trans(qemu_plugin_id_t id, struct qemu_plugin_tb *tb) size_t n_insns = qemu_plugin_tb_n_insns(tb); if (do_inline) { - qemu_plugin_register_vcpu_tb_exec_inline(tb, QEMU_PLUGIN_INLINE_ADD_U64, - &inline_count.bb_count, 1); - qemu_plugin_register_vcpu_tb_exec_inline(tb, QEMU_PLUGIN_INLINE_ADD_U64, - &inline_count.insn_count, - n_insns); + qemu_plugin_register_vcpu_tb_exec_inline_per_vcpu( + tb, QEMU_PLUGIN_INLINE_ADD_U64, bb_count, 1); + qemu_plugin_register_vcpu_tb_exec_inline_per_vcpu( + tb, QEMU_PLUGIN_INLINE_ADD_U64, insn_count, n_insns); } else { qemu_plugin_register_vcpu_tb_exec_cb(tb, vcpu_tb_exec, QEMU_PLUGIN_CB_NO_REGS, @@ -121,18 +118,10 @@ QEMU_PLUGIN_EXPORT int qemu_plugin_install(qemu_plugin_id_t id, } } - if (info->system_emulation && !do_inline) { - max_cpus = info->system.max_vcpus; - counts = g_ptr_array_new(); - for (i = 0; i < max_cpus; i++) { - CPUCount *count = g_new0(CPUCount, 1); - g_mutex_init(&count->lock); - count->index = i; - g_ptr_array_add(counts, count); - } - } else if (!do_inline) { - g_mutex_init(&inline_count.lock); - } + counts = qemu_plugin_scoreboard_new(sizeof(CPUCount)); + bb_count = qemu_plugin_scoreboard_u64_in_struct(counts, CPUCount, bb_count); + insn_count = qemu_plugin_scoreboard_u64_in_struct( + counts, CPUCount, insn_count); if (idle_report) { qemu_plugin_register_vcpu_idle_cb(id, vcpu_idle);