perf x86 test: Update hybrid expectations
Ian Rogers
reviewerPATCH v2 1/2 perf x86 test: Update hybrid expectations
The legacy events cpu-cycles and instructions have sysfs event equivalents on x86 (see /sys/devices/cpu_core/events). As sysfs/JSON events are now higher in priority than legacy events this causes the hybrid test expectations not to be met. To fix this switch to legacy events that don't have sysfs versions, namely cpu-cycles becomes cycles and instructions becomes branches.
--- tools/perf/arch/x86/tests/hybrid.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
tools/perf/arch/x86/tests/hybrid.c +7 -7
@@ -47,7 +47,7 @@ static int test__hybrid_hw_group_event(struct evlist *evlist) evsel =evsel__next (evsel);TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong hybrid type" ,test_hybrid_type (evsel,PERF_TYPE_RAW )); -TEST_ASSERT_VAL ("wrong config" ,test_config (evsel,PERF_COUNT_HW_INSTRUCTIONS )); +TEST_ASSERT_VAL ("wrong config" ,test_config (evsel,PERF_COUNT_HW_BRANCH_INSTRUCTIONS ));TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));return TEST_OK ; }
@@ -102,7 +102,7 @@ static int test__hybrid_group_modifier1(struct evlist *evlist) evsel =evsel__next (evsel);TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong hybrid type" ,test_hybrid_type (evsel,PERF_TYPE_RAW )); -TEST_ASSERT_VAL ("wrong config" ,test_config (evsel,PERF_COUNT_HW_INSTRUCTIONS )); +TEST_ASSERT_VAL ("wrong config" ,test_config (evsel,PERF_COUNT_HW_BRANCH_INSTRUCTIONS ));TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user);TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel);
@@ -171,27 +171,27 @@ struct evlist_test {static const struct evlist_test test__hybrid_events[] = { { - .name ="cpu_core/cpu-cycles/" , + .name ="cpu_core/cycles/" , .check = test__hybrid_hw_event_with_pmu,/* 0 */ }, { - .name ="{cpu_core/cpu-cycles/,cpu_core/instructions/}" , + .name ="{cpu_core/cycles/,cpu_core/branches/}" , .check = test__hybrid_hw_group_event,/* 1 */ }, { - .name ="{cpu-clock,cpu_core/cpu-cycles/}" , + .name ="{cpu-clock,cpu_core/cycles/}" , .check = test__hybrid_sw_hw_group_event,/* 2 */ }, { - .name ="{cpu_core/cpu-cycles/,cpu-clock}" , + .name ="{cpu_core/cycles/,cpu-clock}" , .check = test__hybrid_hw_sw_group_event,/* 3 */ }, { - .name ="{cpu_core/cpu-cycles/k,cpu_core/instructions/u}" , + .name ="{cpu_core/cycles/k,cpu_core/branches/u}" , .check = test__hybrid_group_modifier1,/* 4 */ },
Signature · 1 line
2.43.0.472.g3155946c3a-goog
Ian Rogers
reviewerPATCH v2 2/2 perf x86 test: Add hybrid test for conflicting legacy/sysfs event
The cpu-cycles event is both a legacy event and declared in /sys/devices/cpu_core/events/cpu-cycles. The cycles event is a legacy event but with no sysfs version. Add a test that the sysfs version is preferred to the legacy for cpu-cycles, while for cycles we use the legacy version.
--- tools/perf/arch/x86/tests/hybrid.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
tools/perf/arch/x86/tests/hybrid.c +23 -0
@@ -163,6 +163,24 @@ static int test__checkevent_pmu(struct evlist *evlist)return TEST_OK ; } +static int test__hybrid_hw_group_event_2 (struct evlist *evlist) +{ +struct evsel *evsel, *leader; + + evsel = leader =evlist__first (evlist); +TEST_ASSERT_VAL ("wrong number of entries" ,2 == evlist->core.nr_entries); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type); +TEST_ASSERT_VAL ("wrong hybrid type" ,test_hybrid_type (evsel,PERF_TYPE_RAW )); +TEST_ASSERT_VAL ("wrong config" ,test_config (evsel,PERF_COUNT_HW_CPU_CYCLES )); +TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader)); + + evsel =evsel__next (evsel); +TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_RAW == evsel->core.attr.type); +TEST_ASSERT_VAL ("wrong config" , evsel->core.attr.config ==0x3c ); +TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader)); +return TEST_OK ; +} +struct evlist_test {const char *name;bool (*valid)(void );
@@ -215,6 +233,11 @@ static const struct evlist_test test__hybrid_events[] = { .check = test__hybrid_cache_event, /* 8 */ }, + { + .name = "{cpu_core/cycles/,cpu_core/cpu-cycles/}", + .check = test__hybrid_hw_group_event_2, + /* 9 */ + }, };static int test_event (const struct evlist_test *e)
Signature · 1 line
2.43.0.472.g3155946c3a-goog
Quoted 7 lines · Ian Rogers
The legacy events cpu-cycles and instructions have sysfs event equivalents on x86 (see
/sys/devices/cpu_core/events). As sysfs/JSON events are now higher in priority than legacy events this causes the hybrid test expectations not to be met. To fix this switch to legacy events that don't have sysfs versions, namely cpu-cycles becomes cycles and instructions becomes branches.
Quoted 5 lines
Fixes a24d9d9dc096 ("perf parse-events: Make legacy events lower priority than sysfs/JSON")Reported-by Arnaldo Carvalho de Melo <[email protected]>Signed-off-by Ian Rogers <[email protected]>---
Thanks Ian. For the series,
Thanks,
Kan
Quoted 58 lines
tools/perf/arch/x86/tests/hybrid.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)tools/perf/arch/x86/tests/hybrid.c +7
-7@@ -47,7 +47,7 @@ static int test__hybrid_hw_group_event(struct evlist *evlist) evsel =evsel__next (evsel);TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong hybrid type" ,test_hybrid_type (evsel,PERF_TYPE_RAW )); -TEST_ASSERT_VAL ("wrong config" ,test_config (evsel,PERF_COUNT_HW_INSTRUCTIONS )); +TEST_ASSERT_VAL ("wrong config" ,test_config (evsel,PERF_COUNT_HW_BRANCH_INSTRUCTIONS ));TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));return TEST_OK ; }@@ -102,7 +102,7 @@ static int test__hybrid_group_modifier1(struct evlist *evlist) evsel =evsel__next (evsel);TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong hybrid type" ,test_hybrid_type (evsel,PERF_TYPE_RAW )); -TEST_ASSERT_VAL ("wrong config" ,test_config (evsel,PERF_COUNT_HW_INSTRUCTIONS )); +TEST_ASSERT_VAL ("wrong config" ,test_config (evsel,PERF_COUNT_HW_BRANCH_INSTRUCTIONS ));TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user);TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel);@@ -171,27 +171,27 @@ struct evlist_test {static const struct evlist_test test__hybrid_events[] = { { - .name ="cpu_core/cpu-cycles/" , + .name ="cpu_core/cycles/" , .check = test__hybrid_hw_event_with_pmu,/* 0 */ }, { - .name ="{cpu_core/cpu-cycles/,cpu_core/instructions/}" , + .name ="{cpu_core/cycles/,cpu_core/branches/}" , .check = test__hybrid_hw_group_event,/* 1 */ }, { - .name ="{cpu-clock,cpu_core/cpu-cycles/}" , + .name ="{cpu-clock,cpu_core/cycles/}" , .check = test__hybrid_sw_hw_group_event,/* 2 */ }, { - .name ="{cpu_core/cpu-cycles/,cpu-clock}" , + .name ="{cpu_core/cycles/,cpu-clock}" , .check = test__hybrid_hw_sw_group_event,/* 3 */ }, { - .name ="{cpu_core/cpu-cycles/k,cpu_core/instructions/u}" , + .name ="{cpu_core/cycles/k,cpu_core/branches/u}" , .check = test__hybrid_group_modifier1,/* 4 */ },
Quoted 7 lines · Ian Rogers
The legacy events cpu-cycles and instructions have sysfs event equivalents on x86 (see
/sys/devices/cpu_core/events). As sysfs/JSON events are now higher in priority than legacy events this causes the hybrid test expectations not to be met. To fix this switch to legacy events that don't have sysfs versions, namely cpu-cycles becomes cycles and instructions becomes branches.
Quoted 7 lines
Fixes a24d9d9dc096 ("perf parse-events: Make legacy events lower priority than sysfs/JSON")Reported-by Arnaldo Carvalho de Melo <[email protected]>Signed-off-by Ian Rogers <[email protected]>--- tools/perf/arch/x86/tests/hybrid.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
For both patches:
Mark.
Quoted 59 lines
tools/perf/arch/x86/tests/hybrid.c +7
-7@@ -47,7 +47,7 @@ static int test__hybrid_hw_group_event(struct evlist *evlist) evsel =evsel__next (evsel);TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong hybrid type" ,test_hybrid_type (evsel,PERF_TYPE_RAW )); -TEST_ASSERT_VAL ("wrong config" ,test_config (evsel,PERF_COUNT_HW_INSTRUCTIONS )); +TEST_ASSERT_VAL ("wrong config" ,test_config (evsel,PERF_COUNT_HW_BRANCH_INSTRUCTIONS ));TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));return TEST_OK ; }@@ -102,7 +102,7 @@ static int test__hybrid_group_modifier1(struct evlist *evlist) evsel =evsel__next (evsel);TEST_ASSERT_VAL ("wrong type" ,PERF_TYPE_HARDWARE == evsel->core.attr.type);TEST_ASSERT_VAL ("wrong hybrid type" ,test_hybrid_type (evsel,PERF_TYPE_RAW )); -TEST_ASSERT_VAL ("wrong config" ,test_config (evsel,PERF_COUNT_HW_INSTRUCTIONS )); +TEST_ASSERT_VAL ("wrong config" ,test_config (evsel,PERF_COUNT_HW_BRANCH_INSTRUCTIONS ));TEST_ASSERT_VAL ("wrong leader" ,evsel__has_leader (evsel, leader));TEST_ASSERT_VAL ("wrong exclude_user" , !evsel->core.attr.exclude_user);TEST_ASSERT_VAL ("wrong exclude_kernel" , evsel->core.attr.exclude_kernel);@@ -171,27 +171,27 @@ struct evlist_test {static const struct evlist_test test__hybrid_events[] = { { - .name ="cpu_core/cpu-cycles/" , + .name ="cpu_core/cycles/" , .check = test__hybrid_hw_event_with_pmu,/* 0 */ }, { - .name ="{cpu_core/cpu-cycles/,cpu_core/instructions/}" , + .name ="{cpu_core/cycles/,cpu_core/branches/}" , .check = test__hybrid_hw_group_event,/* 1 */ }, { - .name ="{cpu-clock,cpu_core/cpu-cycles/}" , + .name ="{cpu-clock,cpu_core/cycles/}" , .check = test__hybrid_sw_hw_group_event,/* 2 */ }, { - .name ="{cpu_core/cpu-cycles/,cpu-clock}" , + .name ="{cpu_core/cycles/,cpu-clock}" , .check = test__hybrid_hw_sw_group_event,/* 3 */ }, { - .name ="{cpu_core/cpu-cycles/k,cpu_core/instructions/u}" , + .name ="{cpu_core/cycles/k,cpu_core/branches/u}" , .check = test__hybrid_group_modifier1,/* 4 */ },Signature · 1 line
2.43.0.472.g3155946c3a-goog