Merge pull request #1919 from s7tya/feat/use-regex-filter

Change the filter from includes() to a regex match

Author: Kobzol

site/frontend/src/pages/compare/compile/common.ts

@@ -1,5 +1,6 @@
 import {BenchmarkFilter, CompareResponse, StatComparison} from "../types";
 import {calculateComparison, TestCaseComparison} from "../data";
+import {benchmarkNameMatchesFilter} from "../shared";
 
 export type CompileBenchmarkFilter = {
   profile: {
@@ -158,17 +159,13 @@ export function computeCompileComparisonsWithNonRelevant(
   }
 
   function shouldShowTestCase(comparison: TestCaseComparison<CompileTestCase>) {
-    const name = `${comparison.testCase.benchmark} ${comparison.testCase.profile} ${comparison.testCase.scenario} ${comparison.testCase.backend}`;
-    const nameFilter = filter.name && filter.name.trim();
-    const nameFiltered = !nameFilter || name.includes(nameFilter);
-
     return (
       profileFilter(comparison.testCase.profile) &&
       scenarioFilter(comparison.testCase.scenario) &&
       backendFilter(comparison.testCase.backend) &&
       categoryFilter(comparison.testCase.category) &&
       artifactFilter(benchmarkMap[comparison.testCase.benchmark] ?? null) &&
-      nameFiltered
+      benchmarkNameMatchesFilter(comparison.testCase.benchmark, filter.name)
     );
   }
 

site/frontend/src/pages/compare/runtime/common.ts

@@ -1,5 +1,6 @@
 import {BenchmarkFilter, StatComparison} from "../types";
 import {calculateComparison, TestCaseComparison} from "../data";
+import {benchmarkNameMatchesFilter} from "../shared";
 
 export interface RuntimeTestCase {
   benchmark: string;
@@ -22,10 +23,13 @@ export function computeRuntimeComparisonsWithNonRelevant(
   filter: RuntimeBenchmarkFilter,
   comparisons: RuntimeBenchmarkComparison[]
 ): TestCaseComparison<RuntimeTestCase>[] {
-  function shouldShowTestCase(comparison: TestCaseComparison<RuntimeTestCase>) {
-    const name = comparison.testCase.benchmark;
-    const nameFilter = filter.name && filter.name.trim();
-    return !nameFilter || name.includes(nameFilter);
+  function shouldShowTestCase(
+    comparison: TestCaseComparison<RuntimeTestCase>
+  ): boolean {
+    return benchmarkNameMatchesFilter(
+      comparison.testCase.benchmark,
+      filter.name
+    );
   }
 
   let filteredComparisons = comparisons

site/frontend/src/pages/compare/shared.ts

@@ -78,3 +78,18 @@ export function getBoolOrDefault(
   }
   return defaultValue;
 }
+
+export function benchmarkNameMatchesFilter(
+  benchmarkName: string,
+  filterName: string | null
+): boolean {
+  if (!filterName) return true;
+  const trimmedFilterName = filterName.trim();
+  // Use `includes()` when a regex is not valid.
+  try {
+    const filterRegex = new RegExp(trimmedFilterName);
+    return filterRegex.test(benchmarkName);
+  } catch (e) {
+    return benchmarkName.includes(trimmedFilterName);
+  }
+}