From a8413e8d1cbe3f8db2e14120818b19eaf3e9e847 Mon Sep 17 00:00:00 2001 From: Kewen Meng Date: Thu, 30 Apr 2026 15:41:20 -0700 Subject: [PATCH 1/4] [Tests][USM] Updated USM tests (#2206) --- .../usm-locals-pragma-xnack-disabled-xnack-any/usm_locals.cpp | 2 +- .../usm-locals-pragma-xnack-disabled-xnack-minus/usm_locals.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/smoke-limbo/usm-locals-pragma-xnack-disabled-xnack-any/usm_locals.cpp b/test/smoke-limbo/usm-locals-pragma-xnack-disabled-xnack-any/usm_locals.cpp index a7f35c0b99..d97e2e8821 100644 --- a/test/smoke-limbo/usm-locals-pragma-xnack-disabled-xnack-any/usm_locals.cpp +++ b/test/smoke-limbo/usm-locals-pragma-xnack-disabled-xnack-any/usm_locals.cpp @@ -38,7 +38,7 @@ int main() { /// CHECK-NOT: data_retrieve_async: {{.*}} 0 ({{.*}} 4, {{.*}}) #pragma omp target update from(z[:10]) - /// CHECK: AMDGPU message: Running a program that requires XNACK on a system where XNACK is disabled. This may cause problems when using an OS-allocated pointer inside a target region. Re-run with HSA_XNACK=1 to remove this warning. + /// CHECK: AMDGPU message: Running a program that requires XNACK on a system where XNACK is disabled or not supported. If your device supports XNACK, re-run with HSA_XNACK=1. If your device does not support XNACK, remove USM pragma and use map clauses instead. Set OMPX_EAGER_ZERO_COPY_MAPS=1 for optimal zero-copy performance on non-XNACK shared-memory devices. // Note: when the output is redirected rather than printed at the console, // the printf'd strings are printed AFTER all the OpenMP runtime library diff --git a/test/smoke-limbo/usm-locals-pragma-xnack-disabled-xnack-minus/usm_locals.cpp b/test/smoke-limbo/usm-locals-pragma-xnack-disabled-xnack-minus/usm_locals.cpp index 61c69e523e..e6d339e625 100644 --- a/test/smoke-limbo/usm-locals-pragma-xnack-disabled-xnack-minus/usm_locals.cpp +++ b/test/smoke-limbo/usm-locals-pragma-xnack-disabled-xnack-minus/usm_locals.cpp @@ -38,7 +38,7 @@ int main() { /// CHECK-NOT: data_retrieve_async: {{.*}} 0 ({{.*}} 4, {{.*}}) #pragma omp target update from(z[:10]) - /// CHECK: AMDGPU message: Running a program that requires XNACK on a system where XNACK is disabled. This may cause problems when using an OS-allocated pointer inside a target region. Re-run with HSA_XNACK=1 to remove this warning. + /// CHECK: AMDGPU message: Running a program that requires XNACK on a system where XNACK is disabled or not supported. If your device supports XNACK, re-run with HSA_XNACK=1. If your device does not support XNACK, remove USM pragma and use map clauses instead. Set OMPX_EAGER_ZERO_COPY_MAPS=1 for optimal zero-copy performance on non-XNACK shared-memory devices. // Note: when the output is redirected rather than printed at the console, // the printf'd strings are printed AFTER all the OpenMP runtime library From cbb5f185cf7e4e135808ae189a5975e6b9db6b32 Mon Sep 17 00:00:00 2001 From: dpalermo Date: Thu, 30 Apr 2026 18:03:25 -0500 Subject: [PATCH 2/4] [lint] For infosec team, use read to iterate over files (#2208) * [lint] For infosec team, use read to iterate over files * Change file separator to newline --- .github/workflows/aomp-shell.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/aomp-shell.yml b/.github/workflows/aomp-shell.yml index 27e573e1e6..3878282e23 100644 --- a/.github/workflows/aomp-shell.yml +++ b/.github/workflows/aomp-shell.yml @@ -17,7 +17,7 @@ jobs: id: changed-files uses: tj-actions/changed-files@22103cc46bda19c2b464ffe86db46df6922fd323 with: - separator: ' ' + separator: '\n' skip_initial_fetch: true base_sha: 'HEAD~1' sha: 'HEAD' @@ -29,8 +29,8 @@ jobs: - name: Run shellcheck run: | shellcheck_status=0 - for file in ${{ steps.changed-files.outputs.all_changed_files }}; do - if [[ $file == *.sh ]] || [[ $(file "$file") =~ "shell script" ]]; then + while read -r file; do + if [[ "$file" == *.sh ]] || [[ $(file "$file") =~ "shell script" ]]; then file_dir=$(dirname "$file") file_name=$(basename "$file") @@ -43,6 +43,6 @@ jobs: popd || exit 1 fi - done + done <<< "${{ steps.changed-files.outputs.all_changed_files }}" exit $shellcheck_status shell: bash {0} From 71743282303ed6871cff7751cf2a7dd551ca3cc1 Mon Sep 17 00:00:00 2001 From: dpalermo Date: Thu, 30 Apr 2026 18:46:15 -0500 Subject: [PATCH 3/4] [lint] Use git diff to get file lists (#2210) - Avoid issue with separator: '\n' on changed-files action not actually generating a newline character --- .github/workflows/aomp-shell.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/aomp-shell.yml b/.github/workflows/aomp-shell.yml index 3878282e23..1f43fdf20e 100644 --- a/.github/workflows/aomp-shell.yml +++ b/.github/workflows/aomp-shell.yml @@ -17,7 +17,7 @@ jobs: id: changed-files uses: tj-actions/changed-files@22103cc46bda19c2b464ffe86db46df6922fd323 with: - separator: '\n' + separator: ' ' skip_initial_fetch: true base_sha: 'HEAD~1' sha: 'HEAD' @@ -25,6 +25,7 @@ jobs: - name: Echo changed files run: | echo "Changed files: ${{ steps.changed-files.outputs.all_changed_files }}" + echo "Git diff files: $(git diff --name-only HEAD~1 HEAD)" - name: Run shellcheck run: | @@ -43,6 +44,6 @@ jobs: popd || exit 1 fi - done <<< "${{ steps.changed-files.outputs.all_changed_files }}" + done <<< $(git diff --name-only HEAD~1 HEAD) exit $shellcheck_status shell: bash {0} From d2e57b28be0acba09aa77f01e0a8b040af5d3e52 Mon Sep 17 00:00:00 2001 From: m-palermo <165207759+m-palermo@users.noreply.github.com> Date: Thu, 30 Apr 2026 18:59:17 -0500 Subject: [PATCH 4/4] [srock] Update build_cmake.sh header (#2207) --- srock-bin/build_cmake.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srock-bin/build_cmake.sh b/srock-bin/build_cmake.sh index 26cc44a482..2207e80ff6 100755 --- a/srock-bin/build_cmake.sh +++ b/srock-bin/build_cmake.sh @@ -1,5 +1,7 @@ #!/bin/bash # +# build_cmake.sh : build cmake and ninja +# #Copyright © Advanced Micro Devices, Inc., or its affiliates. # #SPDX-License-Identifier: MIT