Bug 1914574 - Add the new perfcompare URL to mach try perf r=sparky,perftest-reviewers

This also displays it first, with the old compare view URL coming second. Differential Revision: https://phabricator.services.mozilla.com/D219953
2024-08-23 14:19:21 +00:00 · 2024-08-23 14:19:21 +00:00 · d7ce2585b0
--- a/testing/perfdocs/generated/mach-try-perf.rst
+++ b/testing/perfdocs/generated/mach-try-perf.rst
@ -78,7 +78,6 @@ The tool is built to be conservative about the number of tests to run, so if you
      --extra-args [ [ ...]]
                            Set the extra args (e.x, --extra-args verbose post-startup-
                            delay=1)
-      --perfcompare-beta    Use PerfCompare Beta instead of CompareView.
      --non-pgo             Use opt/non-pgo builds instead of shippable/pgo builds. Setting
                            this flag will result in faster try runs.
      --tests [TESTS [TESTS ...]], -t [TESTS [TESTS ...]]
--- a/testing/performance/mach-try-perf/perfdocs/index.rst
+++ b/testing/performance/mach-try-perf/perfdocs/index.rst
@ -78,7 +78,6 @@ The tool is built to be conservative about the number of tests to run, so if you
      --extra-args [ [ ...]]
                            Set the extra args (e.x, --extra-args verbose post-startup-
                            delay=1)
-      --perfcompare-beta    Use PerfCompare Beta instead of CompareView.
      --non-pgo             Use opt/non-pgo builds instead of shippable/pgo builds. Setting
                            this flag will result in faster try runs.
      --tests [TESTS [TESTS ...]], -t [TESTS [TESTS ...]]
--- a/tools/tryselect/selectors/perf.py
+++ b/tools/tryselect/selectors/perf.py
@ -47,7 +47,9 @@ PERFHERDER_BASE_URL = (
    "https://treeherder.mozilla.org/perfherder/"
    "compare?originalProject=try&originalRevision=%s&newProject=try&newRevision=%s"
 )
-PERFCOMPARE_BASE_URL = "https://beta--mozilla-perfcompare.netlify.app/compare-results?baseRev=%s&newRev=%s&baseRepo=try&newRepo=try"
+PERFCOMPARE_BASE_URL = (
+    "https://perf.compare/compare-results?baseRev=%s&newRev=%s&baseRepo=try&newRepo=try"
+)
 TREEHERDER_TRY_BASE_URL = "https://treeherder.mozilla.org/jobs?repo=try&revision=%s"
 TREEHERDER_ALERT_TASKS_URL = (
    "https://treeherder.mozilla.org/api/performance/alertsummary-tasks/?id=%s"
@ -328,14 +330,6 @@ class PerfParser(CompareParser):
                "metavar": "",
            },
        ],
-        [
-            ["--perfcompare-beta"],
-            {
-                "action": "store_true",
-                "default": False,
-                "help": "Use PerfCompare Beta instead of CompareView.",
-            },
-        ],
        [
            ["--non-pgo"],
            {
@ -1541,13 +1535,6 @@ class PerfParser(CompareParser):
                base_cmd[idx] += ":wrap"


-def get_compare_url(revisions, perfcompare_beta=False):
-    """Setup the comparison link."""
-    if perfcompare_beta:
-        return PERFCOMPARE_BASE_URL % revisions
-    return PERFHERDER_BASE_URL % revisions
-
-
 def run(**kwargs):
    if (
        kwargs.get("browsertime_upload_apk") is not None
@ -1582,15 +1569,15 @@ def run(**kwargs):

    # Provide link to perfherder for comparisons now
    if not kwargs.get("single_run", False):
-        perfcompare_url = get_compare_url(
-            revisions, perfcompare_beta=kwargs.get("perfcompare_beta", False)
-        )
+        perfcompare_url = PERFCOMPARE_BASE_URL % revisions
+        compareview_url = PERFHERDER_BASE_URL % revisions
        original_try_url = TREEHERDER_TRY_BASE_URL % revisions[0]
        local_change_try_url = TREEHERDER_TRY_BASE_URL % revisions[1]
        print(
            "\n!!!NOTE!!!\n You'll be able to find a performance comparison here "
            "once the tests are complete (ensure you select the right "
-            "framework): %s\n" % perfcompare_url
+            f"framework):\n {perfcompare_url}\n\n"
+            f" The old comparison tool is still available at this URL:\n {compareview_url}\n"
        )
        print("\n*******************************************************")
        print("*          2 commits/try-runs are created...          *")
--- a/tools/tryselect/test/test_perf.py
+++ b/tools/tryselect/test/test_perf.py
@ -888,8 +888,10 @@ def test_category_expansion_with_non_pgo_flag(category_options, call_counts):
            2,
            (
                "\n!!!NOTE!!!\n You'll be able to find a performance comparison "
-                "here once the tests are complete (ensure you select the right framework): "
-                "https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
+                "here once the tests are complete (ensure you select the right framework):\n"
+                " https://perf.compare/compare-results?baseRev=revision&newRev=revision&baseRepo=try&newRepo=try\n\n"
+                " The old comparison tool is still available at this URL:\n"
+                " https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
                "Revision=revision&newProject=try&newRevision=revision\n"
            ),
        ),
@ -899,8 +901,10 @@ def test_category_expansion_with_non_pgo_flag(category_options, call_counts):
            2,
            (
                "\n!!!NOTE!!!\n You'll be able to find a performance comparison "
-                "here once the tests are complete (ensure you select the right framework): "
-                "https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
+                "here once the tests are complete (ensure you select the right framework):\n"
+                " https://perf.compare/compare-results?baseRev=revision&newRev=revision&baseRepo=try&newRepo=try\n\n"
+                " The old comparison tool is still available at this URL:\n"
+                " https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
                "Revision=revision&newProject=try&newRevision=revision\n"
            ),
        ),
@ -910,8 +914,10 @@ def test_category_expansion_with_non_pgo_flag(category_options, call_counts):
            2,
            (
                "\n!!!NOTE!!!\n You'll be able to find a performance comparison "
-                "here once the tests are complete (ensure you select the right framework): "
-                "https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
+                "here once the tests are complete (ensure you select the right framework):\n"
+                " https://perf.compare/compare-results?baseRev=cached_base_revision&newRev=revision&baseRepo=try&newRepo=try\n\n"
+                " The old comparison tool is still available at this URL:\n"
+                " https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
                "Revision=cached_base_revision&newProject=try&newRevision=revision\n"
            ),
        ),
@ -921,8 +927,10 @@ def test_category_expansion_with_non_pgo_flag(category_options, call_counts):
            2,
            (
                "\n!!!NOTE!!!\n You'll be able to find a performance comparison "
-                "here once the tests are complete (ensure you select the right framework): "
-                "https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
+                "here once the tests are complete (ensure you select the right framework):\n"
+                " https://perf.compare/compare-results?baseRev=&newRev=revision&baseRepo=try&newRepo=try\n\n"
+                " The old comparison tool is still available at this URL:\n"
+                " https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
                "Revision=&newProject=try&newRevision=revision\n"
            ),
        ),
@ -932,8 +940,10 @@ def test_category_expansion_with_non_pgo_flag(category_options, call_counts):
            0,
            (
                "\n!!!NOTE!!!\n You'll be able to find a performance comparison "
-                "here once the tests are complete (ensure you select the right framework): "
-                "https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
+                "here once the tests are complete (ensure you select the right framework):\n"
+                " https://perf.compare/compare-results?baseRev=revision&newRev=revision&baseRepo=try&newRepo=try\n\n"
+                " The old comparison tool is still available at this URL:\n"
+                " https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
                "Revision=revision&newProject=try&newRevision=revision\n"
            ),
        ),
@ -943,8 +953,10 @@ def test_category_expansion_with_non_pgo_flag(category_options, call_counts):
            0,
            (
                "\n!!!NOTE!!!\n You'll be able to find a performance comparison "
-                "here once the tests are complete (ensure you select the right framework): "
-                "https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
+                "here once the tests are complete (ensure you select the right framework):\n"
+                " https://perf.compare/compare-results?baseRev=revision&newRev=revision&baseRepo=try&newRepo=try\n\n"
+                " The old comparison tool is still available at this URL:\n"
+                " https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
                "Revision=revision&newProject=try&newRevision=revision\n"
            ),
        ),
@ -963,30 +975,23 @@ def test_category_expansion_with_non_pgo_flag(category_options, call_counts):
            2,
            (
                "\n!!!NOTE!!!\n You'll be able to find a performance comparison "
-                "here once the tests are complete (ensure you select the right framework): "
-                "https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
+                "here once the tests are complete (ensure you select the right framework):\n"
+                " https://perf.compare/compare-results?baseRev=revision&newRev=revision&baseRepo=try&newRepo=try\n\n"
+                " The old comparison tool is still available at this URL:\n"
+                " https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
                "Revision=revision&newProject=try&newRevision=revision\n"
            ),
        ),
-        (
-            {"perfcompare_beta": True},
-            [10, 2, 2, 10, 2, 1],
-            2,
-            (
-                "\n!!!NOTE!!!\n You'll be able to find a performance comparison "
-                "here once the tests are complete (ensure you select the right framework): "
-                "https://beta--mozilla-perfcompare.netlify.app/compare-results?"
-                "baseRev=revision&newRev=revision&baseRepo=try&newRepo=try\n"
-            ),
-        ),
        (
            {"tests": ["amazon"]},
            [7, 2, 2, 10, 2, 1],
            2,
            (
                "\n!!!NOTE!!!\n You'll be able to find a performance comparison "
-                "here once the tests are complete (ensure you select the right framework): "
-                "https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
+                "here once the tests are complete (ensure you select the right framework):\n"
+                " https://perf.compare/compare-results?baseRev=revision&newRev=revision&baseRepo=try&newRepo=try\n\n"
+                " The old comparison tool is still available at this URL:\n"
+                " https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
                "Revision=revision&newProject=try&newRevision=revision\n"
            ),
        ),
@ -996,8 +1001,10 @@ def test_category_expansion_with_non_pgo_flag(category_options, call_counts):
            1,
            (
                "\n!!!NOTE!!!\n You'll be able to find a performance comparison "
-                "here once the tests are complete (ensure you select the right framework): "
-                "https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
+                "here once the tests are complete (ensure you select the right framework):\n"
+                " https://perf.compare/compare-results?baseRev=revision&newRev=revision&baseRepo=try&newRepo=try\n\n"
+                " The old comparison tool is still available at this URL:\n"
+                " https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
                "Revision=revision&newProject=try&newRevision=revision\n"
            ),
        ),
@ -1007,8 +1014,10 @@ def test_category_expansion_with_non_pgo_flag(category_options, call_counts):
            0,
            (
                "\n!!!NOTE!!!\n You'll be able to find a performance comparison "
-                "here once the tests are complete (ensure you select the right framework): "
-                "https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
+                "here once the tests are complete (ensure you select the right framework):\n"
+                " https://perf.compare/compare-results?baseRev=revision&newRev=revision&baseRepo=try&newRepo=try\n\n"
+                " The old comparison tool is still available at this URL:\n"
+                " https://treeherder.mozilla.org/perfherder/compare?originalProject=try&original"
                "Revision=revision&newProject=try&newRevision=revision\n"
            ),
        ),