Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 21 insertions, 2 deletions

diff --git a/tools/tryselect/selectors/perf.py b/tools/tryselect/selectors/perf.py
index 3c59e5949c..261905d5a3 100644
--- a/tools/tryselect/selectors/perf.py
+++ b/tools/tryselect/selectors/perf.py
@@ -336,6 +336,15 @@ class PerfParser(CompareParser):
                 "help": "Use PerfCompare Beta instead of CompareView.",
             },
         ],
+        [
+            ["--non-pgo"],
+            {
+                "action": "store_true",
+                "default": False,
+                "help": "Use opt/non-pgo builds instead of shippable/pgo builds. "
+                "Setting this flag will result in faster try runs.",
+            },
+        ],
     ]
 
     def get_tasks(base_cmd, queries, query_arg=None, candidate_tasks=None):
@@ -715,7 +724,7 @@ class PerfParser(CompareParser):
                         PerfParser.variants[variant.value]["query"]
                     )
 
-    def _build_categories(category, category_info, category_matrix):
+    def _build_categories(category, category_info, category_matrix, **kwargs):
         """Builds the categories to display."""
         categories = {}
 
@@ -745,6 +754,16 @@ class PerfParser(CompareParser):
                     for suite in category_info["suites"]
                 }
 
+                if kwargs.get("non_pgo"):
+                    for key, query_list in platform_queries.items():
+                        updated_query_list = []
+                        for query in query_list:
+                            updated_query = query.replace(
+                                "'shippable", "!shippable !nightlyasrelease"
+                            )
+                            updated_query_list.append(updated_query)
+                        platform_queries[key] = updated_query_list
+
                 platform_category_name = f"{category} {platform.value}"
                 platform_category_info = {
                     "queries": platform_queries,
@@ -931,7 +950,7 @@ class PerfParser(CompareParser):
         for category, category_matrix in category_decision_matrix.items():
             categories.update(
                 PerfParser._build_categories(
-                    category, PerfParser.categories[category], category_matrix
+                    category, PerfParser.categories[category], category_matrix, **kwargs
                 )
             )