[PATCH v1 16/40] perf test: Validate events with hyphens in

Ian Rogers posted 40 patches 2 years, 7 months ago
There is a newer version of this series
[PATCH v1 16/40] perf test: Validate events with hyphens in
Posted by Ian Rogers 2 years, 7 months ago
Rewritten event parsing can handle event names that contain components
of legacy events.

Signed-off-by: Ian Rogers <irogers@google.com>
---
 tools/perf/tests/parse-events.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
index 6eadb8a47dbf..cb976765b8b0 100644
--- a/tools/perf/tests/parse-events.c
+++ b/tools/perf/tests/parse-events.c
@@ -2198,18 +2198,6 @@ static int test__pmu_events(struct test_suite *test __maybe_unused, int subtest
 			ret = combine_test_results(ret, TEST_SKIP);
 			continue;
 		}
-		/*
-		 * Names containing '-' are recognized as prefixes and suffixes
-		 * due to '-' being a legacy PMU separator. This fails when the
-		 * prefix or suffix collides with an existing legacy token. For
-		 * example, branch-brs has a prefix (branch) that collides with
-		 * a PE_NAME_CACHE_TYPE token causing a parse error as a suffix
-		 * isn't expected after this. As event names in the config
-		 * slashes are allowed a '-' in the name we check this works
-		 * above.
-		 */
-		if (strchr(ent->d_name, '-'))
-			continue;
 
 		dir = opendir(path);
 		if (!dir) {
-- 
2.40.1.495.gc816e09b53d-goog
Re: [PATCH v1 16/40] perf test: Validate events with hyphens in
Posted by Liang, Kan 2 years, 7 months ago

On 2023-04-26 3:00 a.m., Ian Rogers wrote:
> Rewritten event parsing can handle event names that contain components
> of legacy events.


Run the test on Cascade Lake and Alder Lake. It looks good.

Tested-by: Kan Liang <kan.liang@linux.intel.com>

Thanks,
Kan

> 
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
>  tools/perf/tests/parse-events.c | 12 ------------
>  1 file changed, 12 deletions(-)
> 
> diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
> index 6eadb8a47dbf..cb976765b8b0 100644
> --- a/tools/perf/tests/parse-events.c
> +++ b/tools/perf/tests/parse-events.c
> @@ -2198,18 +2198,6 @@ static int test__pmu_events(struct test_suite *test __maybe_unused, int subtest
>  			ret = combine_test_results(ret, TEST_SKIP);
>  			continue;
>  		}
> -		/*
> -		 * Names containing '-' are recognized as prefixes and suffixes
> -		 * due to '-' being a legacy PMU separator. This fails when the
> -		 * prefix or suffix collides with an existing legacy token. For
> -		 * example, branch-brs has a prefix (branch) that collides with
> -		 * a PE_NAME_CACHE_TYPE token causing a parse error as a suffix
> -		 * isn't expected after this. As event names in the config
> -		 * slashes are allowed a '-' in the name we check this works
> -		 * above.
> -		 */
> -		if (strchr(ent->d_name, '-'))
> -			continue;
>  
>  		dir = opendir(path);
>  		if (!dir) {