Revert "Merge remote-tracking branch 'origin/sycl' into llvmspirv_pulldown"

This reverts commit 8b35b01, reversing
changes made to 2ce5fef.

Author: sarnex

.ci/all_requirements.txt

@@ -52,9 +52,6 @@
     "clang": {"clang-tools-extra", "compiler-rt", "cross-project-tests"},
     "clang-tools-extra": {"libc"},
     "mlir": {"flang"},
-    # Test everything if ci scripts are changed.
-    # FIXME: Figure out what is missing and add here.
-    ".ci": {"llvm", "clang", "lld", "lldb"},
 }
 
 DEPENDENT_RUNTIMES_TO_TEST = {"clang": {"libcxx", "libcxxabi", "libunwind"}}
@@ -133,11 +130,12 @@ def _add_dependencies(projects: Set[str]) -> Set[str]:
 def _compute_projects_to_test(modified_projects: Set[str], platform: str) -> Set[str]:
     projects_to_test = set()
     for modified_project in modified_projects:
+        # Skip all projects where we cannot run tests.
+        if modified_project not in PROJECT_CHECK_TARGETS:
+            continue
         if modified_project in RUNTIMES:
             continue
-        # Skip all projects where we cannot run tests.
-        if modified_project in PROJECT_CHECK_TARGETS:
-            projects_to_test.add(modified_project)
+        projects_to_test.add(modified_project)
         if modified_project not in DEPENDENTS_TO_TEST:
             continue
         for dependent_project in DEPENDENTS_TO_TEST[modified_project]:

.ci/compute_projects.py

@@ -188,23 +188,6 @@ def test_exclude_gn(self):
         self.assertEqual(env_variables["runtimes_to_build"], "")
         self.assertEqual(env_variables["runtimes_check_targets"], "")
 
-    def test_ci(self):
-        env_variables = compute_projects.get_env_variables(
-            [".ci/compute_projects.py"], "Linux"
-        )
-        self.assertEqual(env_variables["projects_to_build"], "clang;lld;llvm;lldb")
-        self.assertEqual(
-            env_variables["project_check_targets"],
-            "check-clang check-lld check-llvm check-lldb",
-        )
-        self.assertEqual(
-            env_variables["runtimes_to_build"], "libcxx;libcxxabi;libunwind"
-        )
-        self.assertEqual(
-            env_variables["runtimes_check_targets"],
-            "check-cxx check-cxxabi check-unwind",
-        )
-
 
 if __name__ == "__main__":
     unittest.main()

.ci/compute_projects_test.py

@@ -92,7 +92,7 @@ def plural(num_tests):
             ]
         )
     elif failures:
-        report.extend(["", "## Failed Tests", "(click on a test name to see its output)"])
+        report.extend(["", "## Failed Tests", "(click to see output)"])
 
         for testsuite_name, failures in failures.items():
             report.extend(["", f"### {testsuite_name}"])

.ci/generate_test_report_lib.py

@@ -2,9 +2,6 @@
 # See https://llvm.org/LICENSE.txt for license information.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-# To run these tests:
-# python -m unittest generate_test_report_lib_test.py
-
 import unittest
 from io import StringIO
 from textwrap import dedent
@@ -153,7 +150,7 @@ def test_report_single_file_single_testsuite(self):
           * 2 tests failed
 
           ## Failed Tests
-          (click on a test name to see its output)
+          (click to see output)
 
           ### Bar
           <details>
@@ -185,7 +182,7 @@ def test_report_single_file_single_testsuite(self):
         * 2 tests failed
 
         ## Failed Tests
-        (click on a test name to see its output)
+        (click to see output)
 
         ### ABC
         <details>

.ci/generate_test_report_lib_test.py

@@ -21,16 +21,16 @@
 # Lists the Github workflows we want to track. Maps the Github job name to
 # the metric name prefix in grafana.
 # This metric name is also used as a key in the job->name map.
-GITHUB_WORKFLOW_TO_TRACK = {"CI Checks": "github_llvm_premerge_checks"}
+GITHUB_WORKFLOW_TO_TRACK = {"LLVM Premerge Checks": "github_llvm_premerge_checks"}
 
 # Lists the Github jobs to track for a given workflow. The key is the stable
 # name (metric name) of the workflow (see GITHUB_WORKFLOW_TO_TRACK).
 # Each value is a map to link the github job name to the corresponding metric
 # name.
 GITHUB_JOB_TO_TRACK = {
     "github_llvm_premerge_checks": {
-        "Build and Test Linux (Test Only - Please Ignore Results)": "premerge_linux",
-        "Build and Test Windows (Test Only - Please Ignore Results)": "premerge_windows",
+        "Linux Premerge Checks (Test Only - Please Ignore Results)": "premerge_linux",
+        "Windows Premerge Checks (Test Only - Please Ignore Results)": "premerge_windows",
     }
 }
 
@@ -282,13 +282,6 @@ def github_get_metrics(
     queued_count = collections.Counter()
     running_count = collections.Counter()
 
-    # Initialize all the counters to 0 so we report 0 when no job is queued
-    # or running.
-    for wf_name, wf_metric_name in GITHUB_WORKFLOW_TO_TRACK.items():
-        for job_name, job_metric_name in GITHUB_JOB_TO_TRACK[wf_metric_name].items():
-            queued_count[wf_metric_name + "_" + job_metric_name] = 0
-            running_count[wf_metric_name + "_" + job_metric_name] = 0
-
     # The list of workflows this iteration will process.
     # MaxSize = GITHUB_WORKFLOWS_MAX_PROCESS_COUNT
     workflow_seen_as_completed = set()