Re: [PATCH v4 21/25] perf tests: Support 'Track with sched_switch' test for hybrid

[Jiri Olsa]

On Fri, Apr 16, 2021 at 10:05:13PM +0800, Jin Yao wrote:
> Since for "cycles:u' on hybrid platform, it creates two "cycles".
> So the number of events in evlist is not expected in next test
> steps. Now we just use one event "cpu_core/cycles:u/" for hybrid.
> 
>   # ./perf test 35
>   35: Track with sched_switch                                         : Ok
> 
> Signed-off-by: Jin Yao <yao.jin@xxxxxxxxxxxxxxx>
> ---
>  tools/perf/tests/switch-tracking.c | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/perf/tests/switch-tracking.c b/tools/perf/tests/switch-tracking.c
> index 3ebaa758df77..3a12176f8c46 100644
> --- a/tools/perf/tests/switch-tracking.c
> +++ b/tools/perf/tests/switch-tracking.c
> @@ -18,6 +18,7 @@
>  #include "record.h"
>  #include "tests.h"
>  #include "util/mmap.h"
> +#include "pmu.h"
>  
>  static int spin_sleep(void)
>  {
> @@ -340,6 +341,10 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_
>  	struct evsel *switch_evsel, *tracking_evsel;
>  	const char *comm;
>  	int err = -1;
> +	bool hybrid = false;
> +
> +	if (perf_pmu__has_hybrid())
> +		hybrid = true;
>  
>  	threads = thread_map__new(-1, getpid(), UINT_MAX);
>  	if (!threads) {
> @@ -371,7 +376,10 @@ int test__switch_tracking(struct test *test __maybe_unused, int subtest __maybe_
>  	cpu_clocks_evsel = evlist__last(evlist);
>  
>  	/* Second event */
> -	err = parse_events(evlist, "cycles:u", NULL);
> +	if (!hybrid)

why the variable? some leftover? could be directly
'if (perf_pmu__has_hybrid())' no?

thanks,
jirka

> +		err = parse_events(evlist, "cycles:u", NULL);
> +	else
> +		err = parse_events(evlist, "cpu_core/cycles/u", NULL);
>  	if (err) {
>  		pr_debug("Failed to parse event cycles:u\n");
>  		goto out_err;
> -- 
> 2.17.1
>