Merge branch 'ucount-fixes-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / tools / perf / tests / parse-metric.c

diff --git a/tools/perf/tests/parse-metric.c b/tools/perf/tests/parse-metric.c
index 6dc1db1..4f6f490 100644 (file)
--- a/tools/perf/tests/parse-metric.c
+++ b/tools/perf/tests/parse-metric.c
@@ -11,6 +11,7 @@
 #include "debug.h"
 #include "expr.h"
 #include "stat.h"
+#include "pmu.h"
 
 static struct pmu_event pme_test[] = {
 {
@@ -98,7 +99,7 @@ static u64 find_value(const char *name, struct value *values)
                if (!strcmp(name, v->event))
                        return v->val;
                v++;
-       };
+       }
        return 0;
 }
 
@@ -186,7 +187,7 @@ static int __compute_metric(const char *name, struct value *vals,
                *ratio2 = compute_single(&metric_events, evlist, &st, name2);
 
 out:
-       /* ... clenup. */
+       /* ... cleanup. */
        metricgroup__rblist_exit(&metric_events);
        runtime_stat__exit(&st);
        evlist__free_stats(evlist);
@@ -372,10 +373,13 @@ int test__parse_metric(struct test *test __maybe_unused, int subtest __maybe_unu
 {
        TEST_ASSERT_VAL("IPC failed", test_ipc() == 0);
        TEST_ASSERT_VAL("frontend failed", test_frontend() == 0);
-       TEST_ASSERT_VAL("cache_miss_cycles failed", test_cache_miss_cycles() == 0);
        TEST_ASSERT_VAL("DCache_L2 failed", test_dcache_l2() == 0);
        TEST_ASSERT_VAL("recursion fail failed", test_recursion_fail() == 0);
-       TEST_ASSERT_VAL("test metric group", test_metric_group() == 0);
        TEST_ASSERT_VAL("Memory bandwidth", test_memory_bandwidth() == 0);
+
+       if (!perf_pmu__has_hybrid()) {
+               TEST_ASSERT_VAL("cache_miss_cycles failed", test_cache_miss_cycles() == 0);
+               TEST_ASSERT_VAL("test metric group", test_metric_group() == 0);
+       }
        return 0;
 }