Skip to content

merge aomp-dev into amd-staging #2240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
z1-cciauto wants to merge 2 commits into from
Closed

merge aomp-dev into amd-staging #2240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31f7476
[srock] Update patches after -DTHEROCK_BUILD_COMGR_TESTS added (#2239)
dpalermo Jun 3, 2026
5b70fa6
merge aomp-dev into amd-staging
z1-cciauto Jun 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions srock-bin/patches/amd-staging/_TheRock_01_BUILD_LLVM_TESTS.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ index 4edea369..4cc2d16b 100644
THEROCK_USE_SAFE_DEPENDENCY_PROVIDER
ROCM_SYMLINK_LIBS
diff --git a/compiler/CMakeLists.txt b/compiler/CMakeLists.txt
index bf625919..cdc6c493 100644
index 2bdfe0ee..b772b4bc 100644
--- a/compiler/CMakeLists.txt
+++ b/compiler/CMakeLists.txt
@@ -73,7 +77,7 @@ if(THEROCK_ENABLE_COMPILER)
@@ -77,7 +77,7 @@ if(THEROCK_ENABLE_COMPILER)
-DLIBCXXABI_ENABLE_STATIC=ON

# Features
- -DLLVM_INCLUDE_TESTS=${THEROCK_ENABLE_LLVM_TESTS}
+ -DLLVM_INCLUDE_TESTS=${THEROCK_BUILD_LLVM_TESTS}
-DTHEROCK_BUILD_COMGR_TESTS=${THEROCK_BUILD_COMGR_TESTS}
-DLLVM_ENABLE_ZLIB=FORCE_ON
-DLLVM_ENABLE_Z3_SOLVER=OFF
-DLLVM_ENABLE_LIBXML2=OFF
@@ -85,9 +89,9 @@ if(THEROCK_ENABLE_COMPILER)
@@ -90,9 +90,9 @@ if(THEROCK_ENABLE_COMPILER)
-DLLVM_BUILD_LLVM_C_DYLIB=OFF

# Build optimizations
Expand Down
2 changes: 1 addition & 1 deletion srock-bin/patches/amd-staging/_TheRock_01_lit.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ index bf625919..25ebeb62 100644
# Features
-DLLVM_INCLUDE_TESTS=${THEROCK_BUILD_LLVM_TESTS}
+ -DLLVM_LIT_ARGS='-vv --show-unsupported --show-xfail -j 16'
-DTHEROCK_BUILD_COMGR_TESTS=${THEROCK_BUILD_COMGR_TESTS}
-DLLVM_ENABLE_ZLIB=FORCE_ON
-DLLVM_ENABLE_Z3_SOLVER=OFF
-DLLVM_ENABLE_LIBXML2=OFF