Skip to content

build: small fixups for LLVM 21 support #2034

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

Merged
lgritz merged 1 commit into from
Oct 29, 2025
Merged

build: small fixups for LLVM 21 support #2034

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions src/liboslexec/llvm_instance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2116,7 +2116,11 @@ BackendLLVM::run()
// for NVPTX (https://www.llvm.org/docs/NVPTXUsage.html#triples).
ll.module()->setDataLayout(
"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-i128:128:128-f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:64-v128:128:128-n16:32:64");
# if OSL_LLVM_VERSION < 210
ll.module()->setTargetTriple("nvptx64-nvidia-cuda");
# else
ll.module()->setTargetTriple(llvm::Triple("nvptx64-nvidia-cuda"));
# endif
}
# endif
#else
Expand Down Expand Up @@ -2181,7 +2185,12 @@ BackendLLVM::run()

shadeops_module->setDataLayout(
"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-i128:128:128-f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:64-v128:128:128-n16:32:64");
# if OSL_LLVM_VERSION < 210
shadeops_module->setTargetTriple("nvptx64-nvidia-cuda");
# else
shadeops_module->setTargetTriple(
llvm::Triple("nvptx64-nvidia-cuda"));
# endif

std::unique_ptr<llvm::Module> shadeops_ptr(shadeops_module);
llvm::Linker::linkModules(*ll.module(), std::move(shadeops_ptr),
Expand All @@ -2208,7 +2217,12 @@ BackendLLVM::run()

rend_lib_module->setDataLayout(
"e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-i128:128:128-f32:32:32-f64:64:64-v16:16:16-v32:32:32-v64:64:64-v128:128:128-n16:32:64");
# if OSL_LLVM_VERSION < 210
rend_lib_module->setTargetTriple("nvptx64-nvidia-cuda");
# else
rend_lib_module->setTargetTriple(
llvm::Triple("nvptx64-nvidia-cuda"));
# endif

for (llvm::Function& fn : *rend_lib_module) {
fn.addFnAttr("osl-rend_lib-function", "true");
Expand Down
Loading