forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-10 cde9070d9970eef1f7ec2360586c802a16230ad8
kernel/tools/perf/tests/evsel-roundtrip-name.c
....@@ -11,8 +11,8 @@
1111 {
1212 char name[128];
1313 int type, op, err = 0, ret = 0, i, idx;
14
- struct perf_evsel *evsel;
15
- struct perf_evlist *evlist = perf_evlist__new();
14
+ struct evsel *evsel;
15
+ struct evlist *evlist = evlist__new();
1616
1717 if (evlist == NULL)
1818 return -ENOMEM;
....@@ -20,12 +20,11 @@
2020 for (type = 0; type < PERF_COUNT_HW_CACHE_MAX; type++) {
2121 for (op = 0; op < PERF_COUNT_HW_CACHE_OP_MAX; op++) {
2222 /* skip invalid cache type */
23
- if (!perf_evsel__is_cache_op_valid(type, op))
23
+ if (!evsel__is_cache_op_valid(type, op))
2424 continue;
2525
2626 for (i = 0; i < PERF_COUNT_HW_CACHE_RESULT_MAX; i++) {
27
- __perf_evsel__hw_cache_type_op_res_name(type, op, i,
28
- name, sizeof(name));
27
+ __evsel__hw_cache_type_op_res_name(type, op, i, name, sizeof(name));
2928 err = parse_events(evlist, name, NULL);
3029 if (err)
3130 ret = err;
....@@ -34,41 +33,40 @@
3433 }
3534
3635 idx = 0;
37
- evsel = perf_evlist__first(evlist);
36
+ evsel = evlist__first(evlist);
3837
3938 for (type = 0; type < PERF_COUNT_HW_CACHE_MAX; type++) {
4039 for (op = 0; op < PERF_COUNT_HW_CACHE_OP_MAX; op++) {
4140 /* skip invalid cache type */
42
- if (!perf_evsel__is_cache_op_valid(type, op))
41
+ if (!evsel__is_cache_op_valid(type, op))
4342 continue;
4443
4544 for (i = 0; i < PERF_COUNT_HW_CACHE_RESULT_MAX; i++) {
46
- __perf_evsel__hw_cache_type_op_res_name(type, op, i,
47
- name, sizeof(name));
45
+ __evsel__hw_cache_type_op_res_name(type, op, i, name, sizeof(name));
4846 if (evsel->idx != idx)
4947 continue;
5048
5149 ++idx;
5250
53
- if (strcmp(perf_evsel__name(evsel), name)) {
54
- pr_debug("%s != %s\n", perf_evsel__name(evsel), name);
51
+ if (strcmp(evsel__name(evsel), name)) {
52
+ pr_debug("%s != %s\n", evsel__name(evsel), name);
5553 ret = -1;
5654 }
5755
58
- evsel = perf_evsel__next(evsel);
56
+ evsel = evsel__next(evsel);
5957 }
6058 }
6159 }
6260
63
- perf_evlist__delete(evlist);
61
+ evlist__delete(evlist);
6462 return ret;
6563 }
6664
6765 static int __perf_evsel__name_array_test(const char *names[], int nr_names)
6866 {
6967 int i, err;
70
- struct perf_evsel *evsel;
71
- struct perf_evlist *evlist = perf_evlist__new();
68
+ struct evsel *evsel;
69
+ struct evlist *evlist = evlist__new();
7270
7371 if (evlist == NULL)
7472 return -ENOMEM;
....@@ -84,14 +82,14 @@
8482
8583 err = 0;
8684 evlist__for_each_entry(evlist, evsel) {
87
- if (strcmp(perf_evsel__name(evsel), names[evsel->idx])) {
85
+ if (strcmp(evsel__name(evsel), names[evsel->idx])) {
8886 --err;
89
- pr_debug("%s != %s\n", perf_evsel__name(evsel), names[evsel->idx]);
87
+ pr_debug("%s != %s\n", evsel__name(evsel), names[evsel->idx]);
9088 }
9189 }
9290
9391 out_delete_evlist:
94
- perf_evlist__delete(evlist);
92
+ evlist__delete(evlist);
9593 return err;
9694 }
9795
....@@ -102,12 +100,11 @@
102100 {
103101 int err = 0, ret = 0;
104102
105
- err = perf_evsel__name_array_test(perf_evsel__hw_names);
103
+ err = perf_evsel__name_array_test(evsel__hw_names);
106104 if (err)
107105 ret = err;
108106
109
- err = __perf_evsel__name_array_test(perf_evsel__sw_names,
110
- PERF_COUNT_SW_DUMMY + 1);
107
+ err = __perf_evsel__name_array_test(evsel__sw_names, PERF_COUNT_SW_DUMMY + 1);
111108 if (err)
112109 ret = err;
113110