Merge branch 'main' into machine-outliner-remove-loh

Author: ellishg

.ci/compute_projects.py

@@ -52,8 +52,19 @@
     "clang": {"clang-tools-extra", "cross-project-tests"},
     "mlir": {"flang"},
     # Test everything if ci scripts are changed.
-    # FIXME: Figure out what is missing and add here.
-    ".ci": {"llvm", "clang", "lld", "lldb"},
+    ".ci": {
+        "llvm",
+        "clang",
+        "lld",
+        "lldb",
+        "bolt",
+        "clang-tools-extra",
+        "mlir",
+        "polly",
+        "flang",
+        "libclc",
+        "openmp",
+    },
 }
 
 # This mapping describes runtimes that should be enabled for a specific project,
@@ -66,6 +77,8 @@
 DEPENDENT_RUNTIMES_TO_TEST = {
     "clang": {"compiler-rt"},
     "clang-tools-extra": {"libc"},
+    "libc": {"libc"},
+    ".ci": {"compiler-rt", "libc"},
 }
 DEPENDENT_RUNTIMES_TO_TEST_NEEDS_RECONFIG = {
     "llvm": {"libcxx", "libcxxabi", "libunwind"},
@@ -135,13 +148,11 @@ def _add_dependencies(projects: Set[str], runtimes: Set[str]) -> Set[str]:
     while current_projects_count != len(projects_with_dependents):
         current_projects_count = len(projects_with_dependents)
         for project in list(projects_with_dependents):
-            if project not in PROJECT_DEPENDENCIES:
-                continue
-            projects_with_dependents.update(PROJECT_DEPENDENCIES[project])
+            if project in PROJECT_DEPENDENCIES:
+                projects_with_dependents.update(PROJECT_DEPENDENCIES[project])
     for runtime in runtimes:
-        if runtime not in PROJECT_DEPENDENCIES:
-            continue
-        projects_with_dependents.update(PROJECT_DEPENDENCIES[runtime])
+        if runtime in PROJECT_DEPENDENCIES:
+            projects_with_dependents.update(PROJECT_DEPENDENCIES[runtime])
     return projects_with_dependents
 
 
@@ -187,18 +198,16 @@ def _compute_projects_to_build(
 def _compute_project_check_targets(projects_to_test: Set[str]) -> Set[str]:
     check_targets = set()
     for project_to_test in projects_to_test:
-        if project_to_test not in PROJECT_CHECK_TARGETS:
-            continue
-        check_targets.add(PROJECT_CHECK_TARGETS[project_to_test])
+        if project_to_test in PROJECT_CHECK_TARGETS:
+            check_targets.add(PROJECT_CHECK_TARGETS[project_to_test])
     return check_targets
 
 
 def _compute_runtimes_to_test(modified_projects: Set[str], platform: str) -> Set[str]:
     runtimes_to_test = set()
     for modified_project in modified_projects:
-        if modified_project not in DEPENDENT_RUNTIMES_TO_TEST:
-            continue
-        runtimes_to_test.update(DEPENDENT_RUNTIMES_TO_TEST[modified_project])
+        if modified_project in DEPENDENT_RUNTIMES_TO_TEST:
+            runtimes_to_test.update(DEPENDENT_RUNTIMES_TO_TEST[modified_project])
     return _exclude_projects(runtimes_to_test, platform)
 
 
@@ -207,11 +216,10 @@ def _compute_runtimes_to_test_needs_reconfig(
 ) -> Set[str]:
     runtimes_to_test = set()
     for modified_project in modified_projects:
-        if modified_project not in DEPENDENT_RUNTIMES_TO_TEST_NEEDS_RECONFIG:
-            continue
-        runtimes_to_test.update(
-            DEPENDENT_RUNTIMES_TO_TEST_NEEDS_RECONFIG[modified_project]
-        )
+        if modified_project in DEPENDENT_RUNTIMES_TO_TEST_NEEDS_RECONFIG:
+            runtimes_to_test.update(
+                DEPENDENT_RUNTIMES_TO_TEST_NEEDS_RECONFIG[modified_project]
+            )
     return _exclude_projects(runtimes_to_test, platform)
 
 

.ci/compute_projects_test.py

@@ -187,7 +187,7 @@ def test_top_level_file(self):
         self.assertEqual(env_variables["runtimes_check_targets"], "")
         self.assertEqual(env_variables["runtimes_check_targets_needs_reconfig"], "")
 
-    def test_exclude_runtiems_in_projects(self):
+    def test_exclude_libcxx_in_projects(self):
         env_variables = compute_projects.get_env_variables(
             ["libcxx/CMakeLists.txt"], "Linux"
         )
@@ -197,6 +197,16 @@ def test_exclude_runtiems_in_projects(self):
         self.assertEqual(env_variables["runtimes_check_targets"], "")
         self.assertEqual(env_variables["runtimes_check_targets_needs_reconfig"], "")
 
+    def test_include_libc_in_runtimes(self):
+        env_variables = compute_projects.get_env_variables(
+            ["libc/CMakeLists.txt"], "Linux"
+        )
+        self.assertEqual(env_variables["projects_to_build"], "clang;lld")
+        self.assertEqual(env_variables["project_check_targets"], "")
+        self.assertEqual(env_variables["runtimes_to_build"], "libc")
+        self.assertEqual(env_variables["runtimes_check_targets"], "check-libc")
+        self.assertEqual(env_variables["runtimes_check_targets_needs_reconfig"], "")
+
     def test_exclude_docs(self):
         env_variables = compute_projects.get_env_variables(
             ["llvm/docs/CIBestPractices.rst"], "Linux"
@@ -221,18 +231,21 @@ 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;lldb;llvm")
+        self.assertEqual(
+            env_variables["projects_to_build"],
+            "bolt;clang;clang-tools-extra;flang;libclc;lld;lldb;llvm;mlir;polly",
+        )
         self.assertEqual(
             env_variables["project_check_targets"],
-            "check-clang check-lld check-lldb check-llvm",
+            "check-bolt check-clang check-clang-tools check-flang check-lld check-lldb check-llvm check-mlir check-polly",
         )
         self.assertEqual(
             env_variables["runtimes_to_build"],
-            "libcxx;libcxxabi;libunwind",
+            "compiler-rt;libc;libcxx;libcxxabi;libunwind",
         )
         self.assertEqual(
             env_variables["runtimes_check_targets"],
-            "",
+            "check-compiler-rt check-libc",
         )
         self.assertEqual(
             env_variables["runtimes_check_targets_needs_reconfig"],

.ci/generate-buildkite-pipeline-premerge

@@ -42,14 +42,9 @@ function at-exit {
 
   # If building fails there will be no results files.
   shopt -s nullglob
-  if command -v buildkite-agent 2>&1 >/dev/null
-  then
-    python3 "${MONOREPO_ROOT}"/.ci/generate_test_report_buildkite.py ":linux: Linux x64 Test Results" \
-      "linux-x64-test-results" $retcode "${BUILD_DIR}"/test-results.*.xml
-  else
-    python3 "${MONOREPO_ROOT}"/.ci/generate_test_report_github.py ":penguin: Linux x64 Test Results" \
-      $retcode "${BUILD_DIR}"/test-results.*.xml >> $GITHUB_STEP_SUMMARY
-  fi
+  
+  python3 "${MONOREPO_ROOT}"/.ci/generate_test_report_github.py ":penguin: Linux x64 Test Results" \
+    $retcode "${BUILD_DIR}"/test-results.*.xml >> $GITHUB_STEP_SUMMARY
 }
 trap at-exit EXIT
 

.ci/generate_test_report_buildkite.py

@@ -37,14 +37,9 @@ function at-exit {
 
   # If building fails there will be no results files.
   shopt -s nullglob
-  if command -v buildkite-agent 2>&1 >/dev/null
-  then
-    python "${MONOREPO_ROOT}"/.ci/generate_test_report_buildkite.py ":windows: Windows x64 Test Results" \
-      "windows-x64-test-results" $retcode "${BUILD_DIR}"/test-results.*.xml
-  else
-    python "${MONOREPO_ROOT}"/.ci/generate_test_report_github.py ":window: Windows x64 Test Results" \
-      $retcode "${BUILD_DIR}"/test-results.*.xml >> $GITHUB_STEP_SUMMARY
-  fi
+    
+  python "${MONOREPO_ROOT}"/.ci/generate_test_report_github.py ":window: Windows x64 Test Results" \
+    $retcode "${BUILD_DIR}"/test-results.*.xml >> $GITHUB_STEP_SUMMARY
 }
 trap at-exit EXIT
 

.ci/monolithic-linux.sh

@@ -777,6 +777,10 @@ backend:NVPTX:
   - 'llvm/**/*nvptx*/**'
   - 'llvm/**/*NVPTX*/**'
 
+backend:MIPS:
+  - '**/*mips*'
+  - '**/*Mips*'
+
 backend:RISC-V:
   - clang/**/*riscv*
   - clang/**/*RISCV*

.ci/monolithic-windows.sh

@@ -32,7 +32,8 @@ jobs:
           COMMENT: >-
             ⚠️ We detected that you are using a GitHub private e-mail address to contribute to the repo.<br/>
             Please turn off [Keep my email addresses private](https://github.com/settings/emails) setting in your account.<br/>
-            See [LLVM Discourse](https://discourse.llvm.org/t/hidden-emails-on-github-should-we-do-something-about-it) for more information.
+            See [LLVM Developer Policy](https://llvm.org/docs/DeveloperPolicy.html#email-addresses) and
+            [LLVM Discourse](https://discourse.llvm.org/t/hidden-emails-on-github-should-we-do-something-about-it) for more information.
         run: |
           cat << EOF > comments
           [{"body" : "$COMMENT"}]