perf stat: Use perf_evsel__is_clocki() for clock events

commit eb08d006054e7e374592068919e32579988602d4 upstream.

We already have function to check if a given event is either
SW_CPU_CLOCK or SW_TASK_CLOCK. Utilize it.

Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Anton Blanchard <anton@samba.org>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Thomas Richter <tmricht@linux.vnet.ibm.com>
Cc: yuzhoujian@didichuxing.com
Link: http://lkml.kernel.org/r/20181115095533.16930-1-ravi.bangoria@linux.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Tommi Rantala <tommi.t.rantala@nokia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c
index bbb0e042d8e5802a8de01f50e1c2eebbcf02bfe2..9916d7eafeb8cc795231a9db65e9b2e76dab578b 100644 (file)
--- a/tools/perf/util/stat-shadow.c
+++ b/tools/perf/util/stat-shadow.c
@@ -212,8 +212,7 @@ void perf_stat__update_shadow_stats(struct perf_evsel *counter, u64 count,
 
        count *= counter->scale;
 
-       if (perf_evsel__match(counter, SOFTWARE, SW_TASK_CLOCK) ||
-           perf_evsel__match(counter, SOFTWARE, SW_CPU_CLOCK))
+       if (perf_evsel__is_clock(counter))
                update_runtime_stat(st, STAT_NSECS, 0, cpu, count);
        else if (perf_evsel__match(counter, HARDWARE, HW_CPU_CYCLES))
                update_runtime_stat(st, STAT_CYCLES, ctx, cpu, count);