From: Arnaldo Carvalho de Melo <acme@kernel.org> To: Leo Yan <leo.yan@linaro.org> Cc: Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>, Ian Rogers <irogers@google.com>, John Garry <john.g.garry@oracle.com>, James Clark <james.clark@arm.com>, Adrian Hunter <adrian.hunter@intel.com>, Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, Mark Rutland <mark.rutland@arm.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v5 03/16] perf kvm: Move up metrics helpers Date: Wed, 15 Mar 2023 16:44:35 -0300 [thread overview] Message-ID: <ZBIgI1+s6Zf4Va+i@kernel.org> (raw) In-Reply-To: <20230315145112.186603-4-leo.yan@linaro.org> Em Wed, Mar 15, 2023 at 10:50:59PM +0800, Leo Yan escreveu: > 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}(). Those helper functions are only used if this is true: if defined(HAVE_KVM_STAT_SUPPORT) && defined(HAVE_LIBTRACEEVENT) So keep them enclosed with that. Did it here diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index 62c097a37da9b9fe..c11f5454f35c544a 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -49,6 +49,7 @@ #include <math.h> #include <perf/mmap.h> +#if defined(HAVE_KVM_STAT_SUPPORT) && defined(HAVE_LIBTRACEEVENT) #define GET_EVENT_KEY(func, field) \ static u64 get_event_ ##func(struct kvm_event *event, int vcpu) \ { \ @@ -84,6 +85,7 @@ static struct kvm_event_key keys[] = { DEF_SORT_NAME_KEY(time, mean), { NULL, NULL } }; +#endif // defined(HAVE_KVM_STAT_SUPPORT) && defined(HAVE_LIBTRACEEVENT) static const char *get_filename_for_perf_kvm(void) { > Signed-off-by: Leo Yan <leo.yan@linaro.org> > Reviewed-by: James Clark <james.clark@arm.com> > --- > 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 <math.h> > #include <perf/mmap.h> > > +#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; > -- > 2.34.1 > -- - Arnaldo
WARNING: multiple messages have this Message-ID (diff)
From: Arnaldo Carvalho de Melo <acme@kernel.org> To: Leo Yan <leo.yan@linaro.org> Cc: Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>, Ian Rogers <irogers@google.com>, John Garry <john.g.garry@oracle.com>, James Clark <james.clark@arm.com>, Adrian Hunter <adrian.hunter@intel.com>, Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, Mark Rutland <mark.rutland@arm.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v5 03/16] perf kvm: Move up metrics helpers Date: Wed, 15 Mar 2023 16:44:35 -0300 [thread overview] Message-ID: <ZBIgI1+s6Zf4Va+i@kernel.org> (raw) In-Reply-To: <20230315145112.186603-4-leo.yan@linaro.org> Em Wed, Mar 15, 2023 at 10:50:59PM +0800, Leo Yan escreveu: > 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}(). Those helper functions are only used if this is true: if defined(HAVE_KVM_STAT_SUPPORT) && defined(HAVE_LIBTRACEEVENT) So keep them enclosed with that. Did it here diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index 62c097a37da9b9fe..c11f5454f35c544a 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -49,6 +49,7 @@ #include <math.h> #include <perf/mmap.h> +#if defined(HAVE_KVM_STAT_SUPPORT) && defined(HAVE_LIBTRACEEVENT) #define GET_EVENT_KEY(func, field) \ static u64 get_event_ ##func(struct kvm_event *event, int vcpu) \ { \ @@ -84,6 +85,7 @@ static struct kvm_event_key keys[] = { DEF_SORT_NAME_KEY(time, mean), { NULL, NULL } }; +#endif // defined(HAVE_KVM_STAT_SUPPORT) && defined(HAVE_LIBTRACEEVENT) static const char *get_filename_for_perf_kvm(void) { > Signed-off-by: Leo Yan <leo.yan@linaro.org> > Reviewed-by: James Clark <james.clark@arm.com> > --- > 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 <math.h> > #include <perf/mmap.h> > > +#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; > -- > 2.34.1 > -- - Arnaldo _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-03-15 19:45 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-03-15 14:50 [PATCH v5 00/16] perf kvm: Support histograms and TUI mode Leo Yan 2023-03-15 14:50 ` Leo Yan 2023-03-15 14:50 ` [PATCH v5 01/16] perf kvm: Refactor overall statistics Leo Yan 2023-03-15 14:50 ` Leo Yan 2023-03-15 14:50 ` [PATCH v5 02/16] perf kvm: Add pointer to 'perf_kvm_stat' in kvm event Leo Yan 2023-03-15 14:50 ` Leo Yan 2023-03-15 14:50 ` [PATCH v5 03/16] perf kvm: Move up metrics helpers Leo Yan 2023-03-15 14:50 ` Leo Yan 2023-03-15 19:44 ` Arnaldo Carvalho de Melo [this message] 2023-03-15 19:44 ` Arnaldo Carvalho de Melo 2023-03-15 14:51 ` [PATCH v5 04/16] perf kvm: Use subtraction for comparison metrics Leo Yan 2023-03-15 14:51 ` Leo Yan 2023-03-15 14:51 ` [PATCH v5 05/16] perf kvm: Use macro to replace variable 'decode_str_len' Leo Yan 2023-03-15 14:51 ` Leo Yan 2023-03-15 14:51 ` [PATCH v5 06/16] perf kvm: Introduce histograms data structures Leo Yan 2023-03-15 14:51 ` Leo Yan 2023-03-15 19:45 ` Arnaldo Carvalho de Melo 2023-03-15 19:45 ` Arnaldo Carvalho de Melo 2023-03-16 3:02 ` Leo Yan 2023-03-16 3:02 ` Leo Yan 2023-03-15 14:51 ` [PATCH v5 07/16] perf kvm: Pass argument 'sample' to kvm_alloc_init_event() Leo Yan 2023-03-15 14:51 ` Leo Yan 2023-03-15 14:51 ` [PATCH v5 08/16] perf kvm: Parse address location for samples Leo Yan 2023-03-15 14:51 ` Leo Yan 2023-03-15 14:51 ` [PATCH v5 09/16] perf hist: Add 'kvm_info' field in histograms entry Leo Yan 2023-03-15 14:51 ` Leo Yan 2023-03-15 14:51 ` [PATCH v5 10/16] perf kvm: Add dimensions for KVM event statistics Leo Yan 2023-03-15 14:51 ` Leo Yan 2023-03-15 14:51 ` [PATCH v5 11/16] perf kvm: Use histograms list to replace cached list Leo Yan 2023-03-15 14:51 ` Leo Yan 2023-03-16 7:42 ` Namhyung Kim 2023-03-16 7:42 ` Namhyung Kim 2023-03-16 9:04 ` Leo Yan 2023-03-16 9:04 ` Leo Yan 2023-03-16 10:13 ` Arnaldo Carvalho de Melo 2023-03-16 10:13 ` Arnaldo Carvalho de Melo 2023-03-16 15:14 ` Leo Yan 2023-03-16 15:14 ` Leo Yan 2023-03-15 14:51 ` [PATCH v5 12/16] perf kvm: Polish sorting key Leo Yan 2023-03-15 14:51 ` Leo Yan 2023-03-15 14:51 ` [PATCH v5 13/16] perf kvm: Support printing attributions for dimensions Leo Yan 2023-03-15 14:51 ` Leo Yan 2023-03-15 14:51 ` [PATCH v5 14/16] perf kvm: Add dimensions for percentages Leo Yan 2023-03-15 14:51 ` Leo Yan 2023-03-15 14:51 ` [PATCH v5 15/16] perf kvm: Add TUI mode for stat report Leo Yan 2023-03-15 14:51 ` Leo Yan 2023-03-15 14:51 ` [PATCH v5 16/16] perf kvm: Update documentation to reflect new changes Leo Yan 2023-03-15 14:51 ` Leo Yan 2023-03-15 19:35 ` [PATCH v5 00/16] perf kvm: Support histograms and TUI mode Arnaldo Carvalho de Melo 2023-03-15 19:35 ` Arnaldo Carvalho de Melo 2023-03-16 3:10 ` Leo Yan 2023-03-16 3:10 ` Leo Yan 2023-03-16 10:11 ` Arnaldo Carvalho de Melo 2023-03-16 10:11 ` Arnaldo Carvalho de Melo
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=ZBIgI1+s6Zf4Va+i@kernel.org \ --to=acme@kernel.org \ --cc=adrian.hunter@intel.com \ --cc=alexander.shishkin@linux.intel.com \ --cc=irogers@google.com \ --cc=james.clark@arm.com \ --cc=john.g.garry@oracle.com \ --cc=jolsa@kernel.org \ --cc=leo.yan@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-perf-users@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=mingo@redhat.com \ --cc=namhyung@kernel.org \ --cc=peterz@infradead.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.