Revert "Upstream merge 56 (#1934)"

This reverts commit eeeffde.

Author: dorde-antic

external/llvm-project/.ci/compute_projects.py

@@ -77,7 +77,6 @@
 DEPENDENT_RUNTIMES_TO_TEST = {
     "clang": {"compiler-rt"},
     "clang-tools-extra": {"libc"},
-    "libc": {"libc"},
     ".ci": {"compiler-rt", "libc"},
 }
 DEPENDENT_RUNTIMES_TO_TEST_NEEDS_RECONFIG = {

external/llvm-project/.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_libcxx_in_projects(self):
+    def test_exclude_runtiems_in_projects(self):
         env_variables = compute_projects.get_env_variables(
             ["libcxx/CMakeLists.txt"], "Linux"
         )
@@ -197,16 +197,6 @@ def test_exclude_libcxx_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"

external/llvm-project/.ci/monolithic-linux.sh

@@ -56,7 +56,7 @@ runtime_targets_needs_reconfig="${5}"
 
 lit_args="-v --xunit-xml-output ${BUILD_DIR}/test-results.xml --use-unique-output-file-name --timeout=1200 --time-tests"
 
-echo "::group::cmake"
+echo "--- cmake"
 export PIP_BREAK_SYSTEM_PACKAGES=1
 pip install -q -r "${MONOREPO_ROOT}"/.ci/all_requirements.txt
 
@@ -85,49 +85,38 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
       -D LLDB_ENFORCE_STRICT_TEST_REQUIREMENTS=ON \
       -D CMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
 
-echo "::endgroup::"
-echo "::group::ninja"
-
+echo "--- ninja"
 # Targets are not escaped as they are passed as separate arguments.
 ninja -C "${BUILD_DIR}" -k 0 ${targets}
 
-echo "::endgroup::"
-
 if [[ "${runtime_targets}" != "" ]]; then
-  echo "::group::ninja runtimes"
+  echo "--- ninja runtimes"
 
   ninja -C "${BUILD_DIR}" ${runtime_targets}
-
-  echo "::endgroup::"
 fi
 
 # Compiling runtimes with just-built Clang and running their tests
 # as an additional testing for Clang.
 if [[ "${runtime_targets_needs_reconfig}" != "" ]]; then
-  echo "::group::cmake runtimes C++26"
+  echo "--- cmake runtimes C++26"
 
   cmake \
     -D LIBCXX_TEST_PARAMS="std=c++26" \
     -D LIBCXXABI_TEST_PARAMS="std=c++26" \
     "${BUILD_DIR}"
 
-  echo "::endgroup::"
-  echo "::group::ninja runtimes C++26"
+  echo "--- ninja runtimes C++26"
 
   ninja -C "${BUILD_DIR}" ${runtime_targets_needs_reconfig}
 
-  echo "::endgroup::"
-  echo "::group::cmake runtimes clang modules"
+  echo "--- cmake runtimes clang modules"
 
   cmake \
     -D LIBCXX_TEST_PARAMS="enable_modules=clang" \
     -D LIBCXXABI_TEST_PARAMS="enable_modules=clang" \
     "${BUILD_DIR}"
 
-  echo "::endgroup::"
-  echo "::group::ninja runtimes clang modules"
+  echo "--- ninja runtimes clang modules"
 
   ninja -C "${BUILD_DIR}" ${runtime_targets_needs_reconfig}
-
-  echo "::endgroup::"
 fi

external/llvm-project/.ci/monolithic-windows.sh

@@ -46,7 +46,7 @@ trap at-exit EXIT
 projects="${1}"
 targets="${2}"
 
-echo "::group::cmake"
+echo "--- cmake"
 pip install -q -r "${MONOREPO_ROOT}"/.ci/all_requirements.txt
 
 export CC=cl
@@ -78,10 +78,6 @@ cmake -S "${MONOREPO_ROOT}"/llvm -B "${BUILD_DIR}" \
       -D LLVM_PARALLEL_COMPILE_JOBS=${MAX_PARALLEL_COMPILE_JOBS} \
       -D LLVM_PARALLEL_LINK_JOBS=${MAX_PARALLEL_LINK_JOBS}
 
-echo "::endgroup::"
-echo "::group::ninja"
-
+echo "--- ninja"
 # Targets are not escaped as they are passed as separate arguments.
 ninja -C "${BUILD_DIR}" -k 0 ${targets}
-
-echo "::endgroup"

external/llvm-project/.github/copilot-instructions.md

@@ -632,10 +632,6 @@ llvm:instcombine:
   - llvm/test/Transforms/InstCombine/**
   - llvm/test/Transforms/InstSimplify/**
 
-llvm:vectorcombine:
-  - llvm/lib/Transforms/Vectorize/VectorCombine.cpp
-  - llvm/test/Transforms/VectorCombine/**
-
 clangd:
   - clang-tools-extra/clangd/**
 

external/llvm-project/.github/new-prs-labeler.yml

@@ -43,13 +43,13 @@ jobs:
       - name: Checkout OffloadTest
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
-          repository: llvm/offload-test-suite
+          repository: llvm-beanz/offload-test-suite
           ref: main
           path: OffloadTest
       - name: Checkout Golden Images
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
-          repository: llvm/offload-golden-images
+          repository: llvm-beanz/offload-golden-images
           ref: main
           path: golden-images
       - name: Setup Windows

external/llvm-project/.github/workflows/hlsl-test-all.yaml

@@ -20,7 +20,7 @@ permissions:
 
 jobs:
   restart:
-    if: github.repository_owner == 'llvm' && (github.event.workflow_run.conclusion == 'failure')
+    if: github.repository_owner == 'llvm' && (github.event.workflow_run.conclusion == 'failure' || github.event.workflow_run.conclusion == 'cancelled')
     name: "Restart Job"
     permissions:
       statuses: read
@@ -32,10 +32,7 @@ jobs:
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea #v7.0.1
         with:
           script: |
-            // The "The run was canceled by" message comes from a user manually canceling a workflow
-            // the "higher priority" message comes from github canceling a workflow because the user updated the change.
-            // And the "exit code 1" message indicates a genuine failure.
-            const failure_regex = /(Process completed with exit code 1.)/
+            const failure_regex = /Process completed with exit code 1./
             const preemption_regex = /(The runner has received a shutdown signal)|(The operation was canceled)/
 
             const wf_run = context.payload.workflow_run
@@ -77,7 +74,7 @@ jobs:
                 console.log('Check run was not completed. Skipping.');
                 continue;
               }
-              if (check_run.conclusion != 'failure') {
+              if (check_run.conclusion != 'failure' && check_run.conclusion != 'cancelled') {
                 console.log('Check run had conclusion: ' + check_run.conclusion + '. Skipping.');
                 continue;
               }
@@ -156,3 +153,91 @@ jobs:
                 run_id: context.payload.workflow_run.id
               })
             await create_check_run('success', 'Restarted workflow run due to preempted job')
+
+  restart-test:
+    if: github.repository_owner == 'llvm' && (github.event.workflow_run.conclusion == 'failure' || github.event.workflow_run.conclusion == 'cancelled') && github.event.actor.login == 'ldionne' # TESTING ONLY
+    name: "Restart Job (test)"
+    permissions:
+      statuses: read
+      checks: write
+      actions: write
+    runs-on: ubuntu-24.04
+    steps:
+      - name: "Restart Job (test)"
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea #v7.0.1
+        with:
+          script: |
+            const FAILURE_REGEX = /Process completed with exit code 1./
+            const PREEMPTION_REGEX = /(The runner has received a shutdown signal)|(The operation was canceled)/
+
+            function log(msg) {
+              core.notice(msg)
+            }
+
+            const wf_run = context.payload.workflow_run
+            log(`Running on "${wf_run.display_title}" by @${wf_run.actor.login} (event: ${wf_run.event})\nWorkflow run URL: ${wf_run.html_url}`)
+
+            log('Listing check runs for suite')
+            const check_suites = await github.rest.checks.listForSuite({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              check_suite_id: context.payload.workflow_run.check_suite_id,
+              per_page: 100 // FIXME: We don't have 100 check runs yet, but we should handle this better.
+            })
+
+            preemptions = [];
+            legitimate_failures = [];
+            for (check_run of check_suites.data.check_runs) {
+              log(`Checking check run: ${check_run.id}`);
+              if (check_run.status != 'completed') {
+                log('Check run was not completed. Skipping.');
+                continue;
+              }
+
+              if (check_run.conclusion != 'failure' && check_run.conclusion != 'cancelled') {
+                log(`Check run had conclusion: ${check_run.conclusion}. Skipping.`);
+                continue;
+              }
+
+              annotations = await github.rest.checks.listAnnotations({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                check_run_id: check_run.id
+              })
+
+              preemption_annotation = annotations.data.find(function(annotation) {
+                return annotation.annotation_level == 'failure' &&
+                       annotation.message.match(PREEMPTION_REGEX) != null;
+              });
+              if (preemption_annotation != null) {
+                log(`Found preemption message: ${preemption_annotation.message}`);
+                preemptions.push(check_run);
+                break;
+              }
+
+              failure_annotation = annotations.data.find(function(annotation) {
+                return annotation.annotation_level == 'failure' &&
+                       annotation.message.match(FAILURE_REGEX) != null;
+              });
+              if (failure_annotation != null) {
+                log(`Found legitimate failure annotation: ${failure_annotation.message}`);
+                legitimate_failures.push(check_run);
+                break;
+              }
+            }
+
+            if (preemptions) {
+              log('Found some preempted jobs');
+              if (legitimate_failures) {
+                log('Also found some legitimate failures, so not restarting the workflow.');
+              } else {
+                log('Did not find any legitimate failures. Restarting workflow.');
+                await github.rest.actions.reRunWorkflowFailedJobs({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  run_id: context.payload.workflow_run.id
+                })
+              }
+            } else {
+              log('Did not find any preempted jobs. Not restarting the workflow.');
+            }

external/llvm-project/.github/workflows/libcxx-restart-preempted-jobs.yaml

@@ -1563,6 +1563,9 @@ amd_comgr_action_info_get_working_directory_path(
  *
  * @retval ::AMD_COMGR_STATUS_ERROR_INVALID_ARGUMENT @p
  * action_info is an invalid action info object.
+ *
+ * @retval ::AMD_COMGR_STATUS_ERROR_OUT_OF_RESOURCES
+ * Unable to update action info object as out of resources.
  */
 amd_comgr_status_t AMD_COMGR_API
 amd_comgr_action_info_set_logging(
@@ -1581,6 +1584,9 @@ amd_comgr_action_info_set_logging(
  *
  * @retval ::AMD_COMGR_STATUS_ERROR_INVALID_ARGUMENT @p
  * action_info is an invalid action info object. @p logging is NULL.
+ *
+ * @retval ::AMD_COMGR_STATUS_ERROR_OUT_OF_RESOURCES
+ * Unable to update the data object as out of resources.
  */
 amd_comgr_status_t AMD_COMGR_API
 amd_comgr_action_info_get_logging(

external/llvm-project/amd/comgr/include/amd_comgr.h.in

@@ -810,16 +810,10 @@ amd_comgr_status_t AMDGPUCompiler::createTmpDirs() {
   return AMD_COMGR_STATUS_SUCCESS;
 }
 
-amd_comgr_status_t AMDGPUCompiler::removeTmpDirs() {
-  if (TmpDir.empty()) {
-    return AMD_COMGR_STATUS_SUCCESS;
-  }
-  ProfilePoint Point("RemoveDir");
-
-#ifdef _WIN32
 // On windows fs::remove_directories takes huge time so use fs::remove.
+amd_comgr_status_t removeDirectory(const StringRef DirName) {
   std::error_code EC;
-  for (fs::directory_iterator Dir(TmpDir, EC), DirEnd; Dir != DirEnd && !EC;
+  for (fs::directory_iterator Dir(DirName, EC), DirEnd; Dir != DirEnd && !EC;
        Dir.increment(EC)) {
     const StringRef Path = Dir->path();
 
@@ -849,16 +843,25 @@ amd_comgr_status_t AMDGPUCompiler::removeTmpDirs() {
     }
   }
 
-  if (fs::remove(TmpDir)) {
+  if (fs::remove(DirName)) {
     return AMD_COMGR_STATUS_ERROR;
   }
 
   return AMD_COMGR_STATUS_SUCCESS;
-#else
+}
+
+amd_comgr_status_t AMDGPUCompiler::removeTmpDirs() {
+  if (TmpDir.empty()) {
+    return AMD_COMGR_STATUS_SUCCESS;
+  }
+  ProfilePoint Point("RemoveDir");
+#ifndef _WIN32
   if (fs::remove_directories(TmpDir)) {
     return AMD_COMGR_STATUS_ERROR;
   }
   return AMD_COMGR_STATUS_SUCCESS;
+#else
+  return removeDirectory(TmpDir);
 #endif
 }