Skip to content

[libclc] Move CMake for prepare_builtins to a subdirectory #148815

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

Jump to bottom
Merged
merged 2 commits into from
Jul 15, 2025
Merged

[libclc] Move CMake for prepare_builtins to a subdirectory #148815

merged 2 commits into from
Jul 15, 2025
+26 −22

Conversation

frasercrmck
Copy link
Contributor

This simply makes things better self-contained.

@frasercrmck frasercrmck requested review from arsenm and wenju-he July 15, 2025 09:46
@frasercrmck frasercrmck added the libclc libclc OpenCL library label Jul 15, 2025
wenju-he
wenju-he reviewed Jul 15, 2025
View reviewed changes
wenju-he
wenju-he reviewed Jul 15, 2025
View reviewed changes
wenju-he
wenju-he approved these changes Jul 15, 2025
View reviewed changes
Copy link
Contributor

@wenju-he wenju-he left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@frasercrmck frasercrmck merged commit 8a7a648 into llvm:main Jul 15, 2025
9 checks passed
@frasercrmck frasercrmck deleted the libclc-utils-cmakelists branch July 15, 2025 11:26
@llvm-ci
Copy link
Collaborator

llvm-ci commented Jul 15, 2025

LLVM Buildbot has detected a new failure on builder premerge-monolithic-linux running on premerge-linux-1 while building libclc at step 7 "test-build-unified-tree-check-all".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/153/builds/38155

Here is the relevant piece of the build log for the reference 
Step 7 (test-build-unified-tree-check-all) failure: test (failure)
...
PASS: lit :: shtest-if-else.py (98468 of 101601)
PASS: lld :: COFF/arm64-delayimport.yaml (98469 of 101601)
PASS: flang-Unit :: Optimizer/./FlangOptimizerTests/71/74 (98470 of 101601)
PASS: cfi-standalone-lld-x86_64 :: cross-dso/simple-pass.cpp (98471 of 101601)
PASS: lld :: COFF/arm64-import2.test (98472 of 101601)
PASS: lld :: COFF/alternatename.test (98473 of 101601)
PASS: UBSan-ThreadSanitizer-x86_64 :: TestCases/Pointer/nullptr-and-nonzero-offset-variable.cpp (98474 of 101601)
PASS: lld :: COFF/arm64-thunks.s (98475 of 101601)
PASS: lld :: COFF/arm64ec-exports.s (98476 of 101601)
TIMEOUT: MLIR :: Examples/standalone/test.toy (98477 of 101601)
******************** TEST 'MLIR :: Examples/standalone/test.toy' FAILED ********************
Exit Code: 1
Timeout: Reached timeout of 60 seconds

Command Output (stdout):
--
# RUN: at line 1
"/etc/cmake/bin/cmake" "/build/buildbot/premerge-monolithic-linux/llvm-project/mlir/examples/standalone" -G "Ninja"  -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCMAKE_C_COMPILER=/usr/bin/clang  -DLLVM_ENABLE_LIBCXX=OFF -DMLIR_DIR=/build/buildbot/premerge-monolithic-linux/build/lib/cmake/mlir  -DLLVM_USE_LINKER=lld  -DPython3_EXECUTABLE="/usr/bin/python3.10"
# executed command: /etc/cmake/bin/cmake /build/buildbot/premerge-monolithic-linux/llvm-project/mlir/examples/standalone -G Ninja -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCMAKE_C_COMPILER=/usr/bin/clang -DLLVM_ENABLE_LIBCXX=OFF -DMLIR_DIR=/build/buildbot/premerge-monolithic-linux/build/lib/cmake/mlir -DLLVM_USE_LINKER=lld -DPython3_EXECUTABLE=/usr/bin/python3.10
# .---command stdout------------
# | -- The CXX compiler identification is Clang 16.0.6
# | -- The C compiler identification is Clang 16.0.6
# | -- Detecting CXX compiler ABI info
# | -- Detecting CXX compiler ABI info - done
# | -- Check for working CXX compiler: /usr/bin/clang++ - skipped
# | -- Detecting CXX compile features
# | -- Detecting CXX compile features - done
# | -- Detecting C compiler ABI info
# | -- Detecting C compiler ABI info - done
# | -- Check for working C compiler: /usr/bin/clang - skipped
# | -- Detecting C compile features
# | -- Detecting C compile features - done
# | -- Looking for histedit.h
# | -- Looking for histedit.h - found
# | -- Found LibEdit: /usr/include (found version "2.11") 
# | -- Found ZLIB: /usr/lib/x86_64-linux-gnu/libz.so (found version "1.2.11") 
# | -- Found LibXml2: /usr/lib/x86_64-linux-gnu/libxml2.so (found version "2.9.13") 
# | -- Using MLIRConfig.cmake in: /build/buildbot/premerge-monolithic-linux/build/lib/cmake/mlir
# | -- Using LLVMConfig.cmake in: /build/buildbot/premerge-monolithic-linux/build/lib/cmake/llvm
# | -- Linker detection: unknown
# | -- Performing Test LLVM_LIBSTDCXX_MIN
# | -- Performing Test LLVM_LIBSTDCXX_MIN - Success
# | -- Performing Test LLVM_LIBSTDCXX_SOFT_ERROR
# | -- Performing Test LLVM_LIBSTDCXX_SOFT_ERROR - Success
# | -- Performing Test CXX_SUPPORTS_CUSTOM_LINKER
# | -- Performing Test CXX_SUPPORTS_CUSTOM_LINKER - Success
# | -- Performing Test C_SUPPORTS_FPIC
# | -- Performing Test C_SUPPORTS_FPIC - Success
# | -- Performing Test CXX_SUPPORTS_FPIC

@mgorny
Copy link
Member

mgorny commented Jul 19, 2025

This broke the standalone builds on Gentoo Linux amd64:

[1566/1676] cd /var/tmp/portage/llvm-core/libclc-22.0.0.9999/work/libclc_build && -o /var/tmp/portage/llvm-core/libclc-22.0.0.9999/work/libclc_build/clspv--.bc /var/tmp/portage/llvm-core/libclc-22.0.0.9999/work/libclc_build/obj.libclc.dir/clspv--/builtins.opt.clspv--.bc
FAILED: clspv--.bc /var/tmp/portage/llvm-core/libclc-22.0.0.9999/work/libclc_build/clspv--.bc 
cd /var/tmp/portage/llvm-core/libclc-22.0.0.9999/work/libclc_build && -o /var/tmp/portage/llvm-core/libclc-22.0.0.9999/work/libclc_build/clspv--.bc /var/tmp/portage/llvm-core/libclc-22.0.0.9999/work/libclc_build/obj.libclc.dir/clspv--/builtins.opt.clspv--.bc
/bin/sh: line 1: -o: command not found

@mgorny
Copy link
Member

mgorny commented Jul 19, 2025

Obviously because set in a subdirectory doesn't get exposed to parent CMakeLists.txt…

@mgorny mgorny mentioned this pull request Jul 19, 2025
Merged
@mgorny
Copy link
Member

mgorny commented Jul 19, 2025

Filed #149657 to fix it.

sylvestre pushed a commit that referenced this pull request Jul 20, 2025
@mgorny
[libclc] Expose prepare_builtins_* variables in top-level CMakeLists (
58c3aff 
#149657)

Fix `libclc/utils/CMakeLists.txt` to expose `prepare_builtins_*`
variables in parent scope. This was a regression introduced in #148815
where the code was moved into subdirectory, and the variables would no
longer be accessible to calls in top-level CMakeLists, resulting in
attempting to build targets with empty command:

```
[1566/1676] cd /var/tmp/portage/llvm-core/libclc-22.0.0.9999/work/libclc_build && -o /var/tmp/portage/llvm-core/libclc-22.0.0.9999/work/libclc_build/clspv--.bc /var/tmp/portage/llvm-core/libclc-22.0.0.9999/work/libclc_build/obj.libclc.dir/clspv--/builtins.opt.clspv--.bc
FAILED: clspv--.bc /var/tmp/portage/llvm-core/libclc-22.0.0.9999/work/libclc_build/clspv--.bc
cd /var/tmp/portage/llvm-core/libclc-22.0.0.9999/work/libclc_build && -o /var/tmp/portage/llvm-core/libclc-22.0.0.9999/work/libclc_build/clspv--.bc /var/tmp/portage/llvm-core/libclc-22.0.0.9999/work/libclc_build/obj.libclc.dir/clspv--/builtins.opt.clspv--.bc
/bin/sh: line 1: -o: command not found
```
mgorny added a commit to mgorny/llvm-project that referenced this pull request Jul 20, 2025
@mgorny
Revert "[libclc] Move CMake for prepare_builtins to a subdirectory (l…
92b937e 
…lvm#148815)"

This reverts commit 8a7a648.  It broke
standalone builds since the necessary variables are now limited in scope
to `libclc/utils` while they are used in the top-level CMakeLists.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wenju-he wenju-he wenju-he approved these changes

@arsenm arsenm Awaiting requested review from arsenm

Assignees
No one assigned
Labels
libclc libclc OpenCL library
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@frasercrmck @llvm-ci @mgorny @wenju-he