Merge remote-tracking branch 'origin/amd-staging' into users/jam/sethalt-hotswap-gfx1250-staging

Author: jammm

.ci/compute_projects.py

@@ -75,6 +75,7 @@
 # but not necessarily run for testing. The only case of this currently is lldb
 # which needs some runtimes enabled for tests.
 DEPENDENT_RUNTIMES_TO_BUILD = {
+    "flang": {"openmp"},
     "lldb": {"libcxx", "libcxxabi", "libunwind", "compiler-rt"}
 }
 

.ci/compute_projects_test.py

@@ -219,9 +219,9 @@ def test_flang(self):
         env_variables = compute_projects.get_env_variables(
             ["flang/CMakeLists.txt"], "Linux"
         )
-        self.assertEqual(env_variables["projects_to_build"], "clang;flang;llvm")
+        self.assertEqual(env_variables["projects_to_build"], "clang;flang;lld;llvm")
         self.assertEqual(env_variables["project_check_targets"], "check-flang")
-        self.assertEqual(env_variables["runtimes_to_build"], "flang-rt")
+        self.assertEqual(env_variables["runtimes_to_build"], "flang-rt;openmp")
         self.assertEqual(env_variables["runtimes_check_targets"], "check-flang-rt")
         self.assertEqual(env_variables["runtimes_check_targets_needs_reconfig"], "")
         self.assertEqual(env_variables["enable_cir"], "OFF")

.ci/green-dragon/lldb-windows.groovy

@@ -20,7 +20,9 @@ pipeline {
     stages {
         stage('Pull Docker Image') {
             steps {
-                bat 'docker pull swiftlang/swift-ci:lldb-windowsservercore-1809'
+                timeout(10) {
+                    bat 'docker pull swiftlang/swift-ci:lldb-windowsservercore-1809'
+                }
             }
         }
 
@@ -36,21 +38,27 @@ pipeline {
 
         stage('Print Machine Info') {
             steps {
-                bat '''
-                    docker run --rm ^
-                        swiftlang/swift-ci:lldb-windowsservercore-1809 ^
-                        powershell -Command "cmake --version; ninja --version; python --version; swig -version"
-                '''
+                timeout(5) {
+                    bat '''
+                        docker run --rm ^
+                            swiftlang/swift-ci:lldb-windowsservercore-1809 ^
+                            powershell -Command "cmake --version; ninja --version; python --version; swig -version"
+                    '''
+                }
             }
         }
 
         stage('Build and Test') {
             steps {
-                timeout(240) {
+                timeout(60) {
                     catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
                         writeFile file: 'build.bat', text: '''@echo off
 call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\VC\\Auxiliary\\Build\\vcvars64.bat" || exit /b 1
 
+set "PATH=%PATH%;C:\\Program Files\\Git\\usr\\bin"
+
+if not exist ..\\llvm-build\\test mkdir ..\\llvm-build\\test
+
 cmake -G Ninja ^
     -S llvm ^
     -B ..\\llvm-build\\ ^
@@ -69,11 +77,16 @@ cmake -G Ninja ^
     -DLLDB_ENABLE_LUA=OFF ^
     -DLLDB_ENABLE_LIBXML2=ON ^
     -DLLVM_TARGETS_TO_BUILD=Native ^
-    -DLLVM_LIT_ARGS="-v --time-tests --xunit-xml-output=C:\\workspace\\llvm-build\\test\\results.xml" ^
+    -DLLDB_TEST_USE_LLDB_SERVER=0 ^
+    -DLLVM_LIT_ARGS="-v --time-tests --xunit-xml-output=C:\\workspace\\llvm-build\\test\\results-no-lldb-server.xml" ^
     -DPython3_EXECUTABLE="C:\\Program Files\\Python313\\python.exe" || exit /b 1
+ninja check-lldb -C ..\\llvm-build || exit /b 1
 
-if not exist ..\\llvm-build\\test mkdir ..\\llvm-build\\test
-
+cmake -G Ninja ^
+    -S llvm ^
+    -B ..\\llvm-build\\ ^
+    -DLLDB_TEST_USE_LLDB_SERVER=1 ^
+    -DLLVM_LIT_ARGS="-v --time-tests --xunit-xml-output=C:\\workspace\\llvm-build\\test\\results-lldb-server.xml" || exit /b 1
 ninja check-lldb -C ..\\llvm-build || exit /b 1
 '''
                         bat '''
@@ -92,10 +105,14 @@ ninja check-lldb -C ..\\llvm-build || exit /b 1
 
     post {
         always {
-            junit allowEmptyResults: true, testResults: 'llvm-build/test/results.xml'
+            timeout(5) {
+                junit allowEmptyResults: true, testResults: 'llvm-build/test/results-no-lldb-server.xml,llvm-build/test/results-lldb-server.xml'
+            }
         }
         cleanup {
-            deleteDir()
+            timeout(5) {
+                deleteDir()
+            }
         }
     }
 }

.github/CODEOWNERS

@@ -216,3 +216,8 @@
 # AMDGPU Memory Model
 /llvm/lib/Target/AMDGPU/SIMemoryLegalizer* @Pierre-vh @ritter-x2a
 /llvm/lib/Target/AMDGPU/SIInsertWaitcnts* @Pierre-vh @ritter-x2a
+
+# Clang-Tidy tool
+/clang-tools-extra/clang-tidy/ @vbvictor @zeyi2
+/clang-tools-extra/test/clang-tidy/ @vbvictor @zeyi2
+/clang-tools-extra/docs/clang-tidy/ @vbvictor @zeyi2

.github/new-prs-labeler.yml

@@ -698,11 +698,11 @@ clang:analysis:
 clang:ssaf:
   - changed-files:
     - any-glob-to-any-file:
-      - clang/docs/ScalableStaticAnalysisFramework/**
-      - clang/include/clang/ScalableStaticAnalysisFramework/**
-      - clang/lib/ScalableStaticAnalysisFramework/**
+      - clang/docs/ScalableStaticAnalysis/**
+      - clang/include/clang/ScalableStaticAnalysis/**
+      - clang/lib/ScalableStaticAnalysis/**
       - clang/test/Analysis/Scalable/**
-      - clang/unittests/ScalableStaticAnalysisFramework/**
+      - clang/unittests/ScalableStaticAnalysis/**
 
 clang:static analyzer:
   - changed-files:
@@ -1083,11 +1083,9 @@ backend:MIPS:
 
 backend:RISC-V:
   - changed-files:
-    - any-glob-to-any-file:
-      - '**/*riscv*'
-      - '**/*RISCV*'
-      - '**/*riscv*/**'
-      - '**/*RISCV*/**'
+    - all-globs-to-any-file:
+      - '{**/*riscv**,**/*RISCV**,**/*riscv*/**,**/*RISCV*/**}'
+      - '!libc/config/**'
 
 backend:Xtensa:
   - changed-files:

.github/rocm-prs-labeler.yml

@@ -0,0 +1,32 @@
+comgr:
+  - changed-files:
+    - any-glob-to-any-file:
+      - amd/comgr/**
+
+hotswap:
+  - changed-files:
+    - any-glob-to-any-file:
+      - amd/comgr/src/hotswap/**
+      - amd/comgr/test-lit/hotswap/**
+      - amd/comgr/src/comgr-hotswap*
+
+device-libs:
+  - changed-files:
+    - any-glob-to-any-file:
+      - amd/device-libs/**
+
+hipcc:
+  - changed-files:
+    - any-glob-to-any-file:
+      - amd/hipcc/**
+
+flang:
+  - changed-files:
+    - any-glob-to-any-file:
+      - flang/**
+      - flang-rt/**
+
+openmp:
+  - changed-files:
+    - any-glob-to-any-file:
+      - openmp/**

.github/workflows/PSDB-amd-staging.yml

@@ -82,7 +82,7 @@ jobs:
           PR_NUMBER: ${{ github.event.pull_request.number }}
           COMMIT_HASH: ${{ github.event.after }}
         run: |
-          docker exec -e JENKINS_JOB_NAME=${{secrets.CI_JENKINS_JOB_NAME}}  -e PR_NUMBER=${{ github.event.pull_request.number }}  -e COMMIT_HASH=${{ github.event.after }} -e JENKINS_URL=${{secrets.CI_JENKINS_URL}} -e JENKINS_USER=${{secrets.CI_JENKINS_USER}} -e JENKINS_API_TOKEN=${{secrets.CI_JENKINS_TOKEN}}  "${{env.CONTAINER_NAME}}" /bin/bash -c "PYTHONHTTPSVERIFY=0 python3 cancel_previous_build.py"
+          docker exec -e JENKINS_JOB_NAME=${{secrets.CI_JENKINS_JOB_NAME}}  -e PR_NUMBER=${{ github.event.pull_request.number }}  -e COMMIT_HASH=${{ github.event.after }} -e JENKINS_URL=${{secrets.CI_JENKINS_URL}} -e JENKINS_USER=${{secrets.CI_JENKINS_USER}} -e JENKINS_API_TOKEN=${{secrets.CI_JENKINS_TOKEN}}  "${{env.CONTAINER_NAME}}" /bin/bash -c "python3 cancel_previous_build.py"
 
         
       # Runs a set of commands using the runners shell
@@ -113,7 +113,7 @@ jobs:
           echo "--Running jenkins_api.py with input sha - $input_sha for pull request - $input_pr_url" 
           docker exec -e GITHUB_REPOSITORY="$GITHUB_REPOSITORY" -e svc_acc_org_secret="$svc_acc_org_secret" -e input_sha="$input_sha" -e input_pr_url="$input_pr_url" -e pipeline_name="$pipeline_name" \
                      -e input_pr_num="$input_pr_num" -e PR_TITLE="$PR_TITLE" -e JENKINS_URL="$JENKINS_URL" -e GITHUB_PAT="$svc_acc_org_secret" "${{env.CONTAINER_NAME}}"  \
-                     /bin/bash -c 'echo \"PR NUM: "$input_pr_num"\" && PYTHONHTTPSVERIFY=0 python3 jenkins_api.py -s \"${JENKINS_URL}\" -jn "$pipeline_name" -ghr "$GITHUB_REPOSITORY" -ghsha "$input_sha" -ghprn "$input_pr_num" -ghpru "$input_pr_url" -ghprt "$PR_TITLE" -ghpat="$svc_acc_org_secret"'
+                     /bin/bash -c 'echo \"PR NUM: "$input_pr_num"\" && python3 jenkins_api.py -s \"${JENKINS_URL}\" -jn "$pipeline_name" -ghr "$GITHUB_REPOSITORY" -ghsha "$input_sha" -ghprn "$input_pr_num" -ghpru "$input_pr_url" -ghprt "$PR_TITLE" -ghpat="$svc_acc_org_secret"'
           
       - name: Stop and remove container
         if: always()

.github/workflows/build_metadata_extractor.py

@@ -83,16 +83,17 @@ def extract_submodule_table(self, manifest_data):
                continue
             submodule_url = f"{commit_base_url}/{submodule_name}"
             commit_url = f"{submodule_url}/commit/{pin_sha}"
-            table += f'| {submodule_name} | ({commit_url}) |\n'
+            short_sha = pin_sha[:12]
+            table += f'| {submodule_name} | [{short_sha}]({commit_url}) |\n'
 
         return table
 
     def generate_manifest_artifact_logs_table(self):
         """Creates a table for Rock Manifest, Artifacts, and Build Logs."""
         table = '| Description | URL |\n|-------------|-----|\n'
-        #table += f'| Rock Manifest | ({self.rock_manifest_url}) |\\n'
-        table += f'| Artifacts | ({self.artifacts_url}) |\\n'
-        table += f'| Build Logs | ({self.build_logs_url}) |\\n'
+        #table += f'| Rock Manifest | [Rock Manifest]({self.rock_manifest_url}) |\n'
+        table += f'| Artifacts | [Artifacts]({self.artifacts_url}) |\n'
+        table += f'| Build Logs | [Build Logs]({self.build_logs_url}) |\n'
 
         return table
 
@@ -117,7 +118,7 @@ def list_failures(self):
         for job in failure_jobs:
             job_name = job['name']
             job_url = job['html_url']
-            failure_table += f'| {job_name} | ({job_url}) |\\n'
+            failure_table += f'| {job_name} | [job]({job_url}) |\n'
         return failure_table
 
     def save_results_to_file(self,submodule_table, manifest_artifacts_table, failure_table):

.github/workflows/libcxx-run-benchmarks.yml

@@ -18,10 +18,6 @@ on:
       - created
       - edited
 
-env:
-  CC: clang-22
-  CXX: clang++-22
-
 jobs:
   permission-check:
     if: >-
@@ -45,12 +41,12 @@ jobs:
           LLVM_TOKEN_GENERATOR_CLIENT_ID: ${{ secrets.LLVM_TOKEN_GENERATOR_CLIENT_ID }}
           LLVM_TOKEN_GENERATOR_PRIVATE_KEY: ${{ secrets.LLVM_TOKEN_GENERATOR_PRIVATE_KEY }}
 
-  run-benchmarks:
-    permissions:
-      pull-requests: write
-    runs-on: llvm-premerge-libcxx-next-runners # TODO: This should run on a dedicated set of machines
+  extract-info:
+    runs-on: ubuntu-24.04
     needs:
       - permission-check
+    permissions:
+      pull-requests: write
     steps:
       - uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
@@ -78,59 +74,103 @@ jobs:
           BENCHMARKS=$(echo "$COMMENT_BODY" | sed -nE 's/\/libcxx-bot benchmark (.+)/\1/p')
           echo "benchmarks=${BENCHMARKS}" >> ${GITHUB_OUTPUT}
 
-      - name: Update comment with link to the job
-        env:
-          JOB_CHECK_RUN_ID: ${{ job.check_run_id }}
+      - name: Update comment with link to the run
         run: |
           source .venv/bin/activate
           cat <<EOF | python
           import github
           repo = github.Github(auth=github.Auth.Token("${{ github.token }}")).get_repo("${{ github.repository }}")
           pr = repo.get_pull(${{ github.event.issue.number }})
           comment = pr.get_issue_comment(${{ github.event.comment.id }})
-          add_text = "> _Running benchmarks in ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/job/${JOB_CHECK_RUN_ID}_"
+          add_text = "> _Running benchmarks in ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}_"
           comment.edit('\n\n'.join([comment.body, add_text]))
           EOF
+    outputs:
+      pr_base: ${{ steps.vars.outputs.pr_base }}
+      pr_head: ${{ steps.vars.outputs.pr_head }}
+      benchmarks: ${{ steps.vars.outputs.benchmarks }}
 
+  run-benchmarks:
+    strategy:
+      matrix:
+        include:
+          - platform: macOS 26.5 arm64
+            runner: ["self-hosted", "macOS", "ARM64", "26", "26.5"]
+            cc: clang
+            cxx: clang++
+            install-python: false
+            install-macos-dependencies: true
+          - platform: Linux x86_64
+            runner: llvm-premerge-libcxx-next-runners
+            cc: clang-22
+            cxx: clang++-22
+            install-python: true
+            install-macos-dependencies: false
+      fail-fast: false
+    permissions:
+      pull-requests: write
+    runs-on: ${{ matrix.runner }}
+    needs:
+      - extract-info
+    env:
+      CC: ${{ matrix.cc }}
+      CXX: ${{ matrix.cxx }}
+    steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
-          ref: ${{ steps.vars.outputs.pr_head }}
+          ref: ${{ needs.extract-info.outputs.pr_head }}
           fetch-depth: 0
           fetch-tags: true # This job requires access to all the Git branches so it can diff against (usually) main
-          path: repo # Avoid nuking the workspace, where we have the Python virtualenv
+
+      - name: Install Python
+        if: ${{ matrix.install-python }}
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        with:
+          python-version: '3.14'
+
+      - name: Install Ninja and CMake
+        if: ${{ matrix.install-macos-dependencies }}
+        run: |
+          brew install ninja cmake
+
+      - name: Setup virtual environment
+        run: |
+          python3 -m venv .venv
+          source .venv/bin/activate
+          python -m pip install -r libcxx/utils/requirements.txt
+          python -m pip install pygithub==2.8.1
 
       - name: Build and run baseline
         env:
-          BENCHMARKS: ${{ steps.vars.outputs.benchmarks }}
-          PR_HEAD: ${{ steps.vars.outputs.pr_head }}
-          PR_BASE: ${{ steps.vars.outputs.pr_base }}
+          BENCHMARKS: ${{ needs.extract-info.outputs.benchmarks }}
+          PR_HEAD: ${{ needs.extract-info.outputs.pr_head }}
+          PR_BASE: ${{ needs.extract-info.outputs.pr_base }}
         run: |
-          source .venv/bin/activate && cd repo
-          python -m pip install -r libcxx/utils/requirements.txt
+          source .venv/bin/activate
           baseline_commit=$(git merge-base $PR_BASE $PR_HEAD)
           ./libcxx/utils/build-at-commit --commit ${baseline_commit} --install-dir install/baseline -- -DCMAKE_BUILD_TYPE=RelWithDebInfo
           ./libcxx/utils/test-at-commit --libcxx-installation install/baseline -B benchmarks/baseline -- -sv -j1 --param optimization=speed "$BENCHMARKS"
           ./libcxx/utils/consolidate-benchmarks benchmarks/baseline | tee baseline.lnt
 
       - name: Build and run candidate
         env:
-          BENCHMARKS: ${{ steps.vars.outputs.benchmarks }}
-          PR_HEAD: ${{ steps.vars.outputs.pr_head }}
+          BENCHMARKS: ${{ needs.extract-info.outputs.benchmarks }}
+          PR_HEAD: ${{ needs.extract-info.outputs.pr_head }}
         run: |
-          source .venv/bin/activate && cd repo
+          source .venv/bin/activate
           ./libcxx/utils/build-at-commit --commit $PR_HEAD --install-dir install/candidate -- -DCMAKE_BUILD_TYPE=RelWithDebInfo
           ./libcxx/utils/test-at-commit --libcxx-installation install/candidate -B benchmarks/candidate -- -sv -j1 --param optimization=speed "$BENCHMARKS"
           ./libcxx/utils/consolidate-benchmarks benchmarks/candidate | tee candidate.lnt
 
       - name: Compare baseline and candidate runs
         run: |
-          source .venv/bin/activate && cd repo
+          source .venv/bin/activate
           ./libcxx/utils/compare-benchmarks baseline.lnt candidate.lnt | tee results.txt
 
       - name: Update comment with results
         run: |
-          source .venv/bin/activate && cd repo
+          source .venv/bin/activate
           cat <<EOF | python
           import github
           repo = github.Github(auth=github.Auth.Token("${{ github.token }}")).get_repo("${{ github.repository }}")
@@ -144,7 +184,7 @@ jobs:
 
           <details>
           <summary>
-          Benchmark results:
+          Benchmark results for ${{ matrix.platform }}:
           </summary>
 
           \`\`\`