From patchwork Mon Mar 13 11:40:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Yan X-Patchwork-Id: 13172303 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C06D7C76196 for ; Mon, 13 Mar 2023 11:42:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4CmB8kIvjg1Us3HAKhr0mHDnjk0Icl+j7Ztkbwz8JU0=; b=lI6inRDUMzKUhP zZvwvenoCtZZFEW/dWQbL3Fl62EgUMAQJpS0eV3xi309OBDEgJcJlh4+G4xUst8oIHYbdJwwnnGkb Qs2R3i0fmY/5jH9ZEDMjxHcjb//5ID+zVb5fePSuSsiU9FJPEHQjZOxNEyGr+elezVcAwaQgAEnh9 DZ6mccia9t249M1DpV0gMB/0aukByWM9Hrda3ZXgqMM4TTtDWa0ryF//lnkn2Cf+f2QykQwHZoOtW IaFqQfxPr3NDthFiWjoIGTOmqQKR5GIHk/hE1qEGYObfpTBkSmlVyD/TGp1bXj0QDwkd9HcTLeIly Rji0IxKCclsgUCPgQj+A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pbgY9-005S7J-Ft; Mon, 13 Mar 2023 11:41:09 +0000 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pbgXv-005S2d-E7 for linux-arm-kernel@lists.infradead.org; Mon, 13 Mar 2023 11:40:56 +0000 Received: by mail-pj1-x102a.google.com with SMTP id y2so11677728pjg.3 for ; Mon, 13 Mar 2023 04:40:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678707655; 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=F9P/WNNNsLKtkXIlBizDtRA5HEUxXu0PrB/8N0zALdo=; b=lnyLElApv7NnUsgOvaifBSHgYeHAmg6da7c7jzAexRiFFgCaBVjIDqWsedH4pS3CQ2 Jw0+7ZrHOQBWZGR/XKq2dkLxLEMHw9AE9/58WvGpBwyGvQ3Ilrj0Kvhm04xfWfySExcD 5DETnEtSfjQIEf27I/QR4HS4fKDgHnT/aeCKKy0yZLaKzO229NgEPXyov+ObigOAonz7 bKX4em//1FqtEQVLJPTz+j5dg7zEIfAaUKv78qttuZnOp2Om45cIM4cLM1RFnGFaQEVR OoAG6i+q6Mg9TyDVwnMQFQNHCNp7OlDcOZq1aUkdLzU8yUP0OSLjyo9xKTLqAI+LI6jU EZxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678707655; 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=F9P/WNNNsLKtkXIlBizDtRA5HEUxXu0PrB/8N0zALdo=; b=jY5yiQ/n/KuphxbY0QLcFYldX9Yu4lZKJfCJfHAGnDpwydWHnAZ1nQidQCLqYnWzKE Tlt5coPONhTw+u30mIZvHKaU73cjQWDQU5ch3SndY9pvNKYTwlwwW1PHXPFes4LGdDdt y/Dn6yXT/iv7gA4stVjgqPbgklehrsHAujHkllkQ0NIVRgqxCyJIrweUgamWMeMb5Wxf kmx4DczVhuh53MmRleF+tuuQ5/gpChslWokQCKPtr0IJoNekDh7YNlkUEDk3863wmfcz 3DIyR11FHmxgVL+xwKDqojUwp7v+BYRW6RQZtGiQjIzAVTrplOj5MeNNMmbhrftslyRe jmqQ== X-Gm-Message-State: AO0yUKXa88Rj5fR7GbFfy7e4G/mJtxxutv7ohYDlHp9MdCLuxzvOprHx GhYKmOoAsJEV0K0zxb2+enUinw== X-Google-Smtp-Source: AK7set9NefgnF+3svVDo4B3o+1IDC59WD7sj8UM5nnDc9xjSkGgKmUAixlouEv38J+Ox6ns97dZuQg== X-Received: by 2002:a17:90b:38c3:b0:237:d44c:5861 with SMTP id nn3-20020a17090b38c300b00237d44c5861mr35810313pjb.12.1678707654867; Mon, 13 Mar 2023 04:40:54 -0700 (PDT) Received: from leoy-huanghe.lan ([156.59.236.112]) by smtp.gmail.com with ESMTPSA id q21-20020a17090a2e1500b0022335f1dae2sm4281625pjd.22.2023.03.13.04.40.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Mar 2023 04:40:54 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Jiri Olsa , Namhyung Kim , Ian Rogers , John Garry , James Clark , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Leo Yan Subject: [PATCH v4 03/16] perf kvm: Move up metrics helpers Date: Mon, 13 Mar 2023 19:40:05 +0800 Message-Id: <20230313114018.543254-4-leo.yan@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230313114018.543254-1-leo.yan@linaro.org> References: <20230313114018.543254-1-leo.yan@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230313_044055_497168_9F0FE7C3 X-CRM114-Status: GOOD ( 14.30 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This patch moves up the helper functions of event's metrics for later adding code to call them. No any functionality changes, but has a function renaming from compare_kvm_event_{metric}() to cmp_event_{metric}(). Signed-off-by: Leo Yan Reviewed-by: James Clark --- tools/perf/builtin-kvm.c | 72 ++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index 3d2560ec6b37..62c097a37da9 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -49,6 +49,42 @@ #include #include +#define GET_EVENT_KEY(func, field) \ +static u64 get_event_ ##func(struct kvm_event *event, int vcpu) \ +{ \ + if (vcpu == -1) \ + return event->total.field; \ + \ + if (vcpu >= event->max_vcpu) \ + return 0; \ + \ + return event->vcpu[vcpu].field; \ +} + +#define COMPARE_EVENT_KEY(func, field) \ +GET_EVENT_KEY(func, field) \ +static int cmp_event_ ## func(struct kvm_event *one, \ + struct kvm_event *two, int vcpu) \ +{ \ + return get_event_ ##func(one, vcpu) > \ + get_event_ ##func(two, vcpu); \ +} + +GET_EVENT_KEY(time, time); +GET_EVENT_KEY(max, stats.max); +GET_EVENT_KEY(min, stats.min); +COMPARE_EVENT_KEY(count, stats.n); +COMPARE_EVENT_KEY(mean, stats.mean); + +#define DEF_SORT_NAME_KEY(name, compare_key) \ + { #name, cmp_event_ ## compare_key } + +static struct kvm_event_key keys[] = { + DEF_SORT_NAME_KEY(sample, count), + DEF_SORT_NAME_KEY(time, mean), + { NULL, NULL } +}; + static const char *get_filename_for_perf_kvm(void) { const char *filename; @@ -461,42 +497,6 @@ static bool handle_kvm_event(struct perf_kvm_stat *kvm, return true; } -#define GET_EVENT_KEY(func, field) \ -static u64 get_event_ ##func(struct kvm_event *event, int vcpu) \ -{ \ - if (vcpu == -1) \ - return event->total.field; \ - \ - if (vcpu >= event->max_vcpu) \ - return 0; \ - \ - return event->vcpu[vcpu].field; \ -} - -#define COMPARE_EVENT_KEY(func, field) \ -GET_EVENT_KEY(func, field) \ -static int compare_kvm_event_ ## func(struct kvm_event *one, \ - struct kvm_event *two, int vcpu)\ -{ \ - return get_event_ ##func(one, vcpu) > \ - get_event_ ##func(two, vcpu); \ -} - -GET_EVENT_KEY(time, time); -COMPARE_EVENT_KEY(count, stats.n); -COMPARE_EVENT_KEY(mean, stats.mean); -GET_EVENT_KEY(max, stats.max); -GET_EVENT_KEY(min, stats.min); - -#define DEF_SORT_NAME_KEY(name, compare_key) \ - { #name, compare_kvm_event_ ## compare_key } - -static struct kvm_event_key keys[] = { - DEF_SORT_NAME_KEY(sample, count), - DEF_SORT_NAME_KEY(time, mean), - { NULL, NULL } -}; - static bool select_key(struct perf_kvm_stat *kvm) { int i;