[PATCH 6/6] perf stat: Don't compare runtime stat for shadow stats

Namhyung Kim posted 6 patches 3 years, 6 months ago
[PATCH 6/6] perf stat: Don't compare runtime stat for shadow stats
Posted by Namhyung Kim 3 years, 6 months ago
Now it always uses the global rt_stat.  Let's get rid of the field from
the saved_value.  When the both evsels are NULL, it'd return 0 so remove
the block in the saved_value_cmp.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 tools/perf/util/stat-shadow.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c
index 99d05262055c..700563306637 100644
--- a/tools/perf/util/stat-shadow.c
+++ b/tools/perf/util/stat-shadow.c
@@ -35,7 +35,6 @@ struct saved_value {
 	int ctx;
 	int map_idx;
 	struct cgroup *cgrp;
-	struct runtime_stat *stat;
 	struct stats stats;
 	u64 metric_total;
 	int metric_other;
@@ -67,16 +66,6 @@ static int saved_value_cmp(struct rb_node *rb_node, const void *entry)
 	if (a->cgrp != b->cgrp)
 		return (char *)a->cgrp < (char *)b->cgrp ? -1 : +1;
 
-	if (a->evsel == NULL && b->evsel == NULL) {
-		if (a->stat == b->stat)
-			return 0;
-
-		if ((char *)a->stat < (char *)b->stat)
-			return -1;
-
-		return 1;
-	}
-
 	if (a->evsel == b->evsel)
 		return 0;
 	if ((char *)a->evsel < (char *)b->evsel)
@@ -120,7 +109,6 @@ static struct saved_value *saved_value_lookup(struct evsel *evsel,
 		.evsel = evsel,
 		.type = type,
 		.ctx = ctx,
-		.stat = st,
 		.cgrp = cgrp,
 	};
 
-- 
2.37.3.998.g577e59143f-goog
Re: [PATCH 6/6] perf stat: Don't compare runtime stat for shadow stats
Posted by James Clark 3 years, 6 months ago

On 26/09/2022 21:07, Namhyung Kim wrote:
> Now it always uses the global rt_stat.  Let's get rid of the field from
> the saved_value.  When the both evsels are NULL, it'd return 0 so remove
> the block in the saved_value_cmp.
> 
> Signed-off-by: Namhyung Kim <namhyung@kernel.org>
> ---
>  tools/perf/util/stat-shadow.c | 12 ------------
>  1 file changed, 12 deletions(-)
> 
Reviewed-by: James Clark <james.clark@arm.com>

> diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c
> index 99d05262055c..700563306637 100644
> --- a/tools/perf/util/stat-shadow.c
> +++ b/tools/perf/util/stat-shadow.c
> @@ -35,7 +35,6 @@ struct saved_value {
>  	int ctx;
>  	int map_idx;
>  	struct cgroup *cgrp;
> -	struct runtime_stat *stat;
>  	struct stats stats;
>  	u64 metric_total;
>  	int metric_other;
> @@ -67,16 +66,6 @@ static int saved_value_cmp(struct rb_node *rb_node, const void *entry)
>  	if (a->cgrp != b->cgrp)
>  		return (char *)a->cgrp < (char *)b->cgrp ? -1 : +1;
>  
> -	if (a->evsel == NULL && b->evsel == NULL) {
> -		if (a->stat == b->stat)
> -			return 0;
> -
> -		if ((char *)a->stat < (char *)b->stat)
> -			return -1;
> -
> -		return 1;
> -	}
> -
>  	if (a->evsel == b->evsel)
>  		return 0;
>  	if ((char *)a->evsel < (char *)b->evsel)
> @@ -120,7 +109,6 @@ static struct saved_value *saved_value_lookup(struct evsel *evsel,
>  		.evsel = evsel,
>  		.type = type,
>  		.ctx = ctx,
> -		.stat = st,
>  		.cgrp = cgrp,
>  	};
>