Skip to content

Fix top LLVM: renamed NVPTX barrier intrinsics. #8631

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
mcourteaux merged 8 commits into from
May 24, 2025
Merged

Fix top LLVM: renamed NVPTX barrier intrinsics. #8631

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
09291e6
Attempt to fix the barrier0 intrinsic in LLVM 20.
mcourteaux May 22, 2025
98b2f01
Attempt to fix LLVM barrier for PTX.
mcourteaux May 22, 2025
5cd35d5
Small fix.
mcourteaux May 22, 2025
9cd8dda
Cleanup
mcourteaux May 22, 2025
c964920
Clearer code flow, and deprecation note for the future.
mcourteaux May 22, 2025
c84e8d3
Fix typo
mcourteaux May 22, 2025
9499444
Please the compiler.
mcourteaux May 22, 2025
3daccd7
Use getIntrinsicID to test which one is actually the working one.
mcourteaux May 24, 2025
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
12 changes: 9 additions & 3 deletions src/CodeGen_PTX_Dev.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,9 +262,15 @@ void CodeGen_PTX_Dev::visit(const Call *op) {
auto fence_type_ptr = as_const_int(op->args[0]);
internal_assert(fence_type_ptr) << "gpu_thread_barrier() parameter is not a constant integer.\n";

llvm::Function *barrier0 = module->getFunction("llvm.nvvm.barrier0");
internal_assert(barrier0) << "Could not find PTX barrier intrinsic (llvm.nvvm.barrier0)\n";
builder->CreateCall(barrier0);
llvm::Function *barrier = module->getFunction("llvm.nvvm.barrier0");
if (barrier) {
builder->CreateCall(barrier0);
} else {
// Changed in LLVM 20: https://github.com/llvm/llvm-project/pull/140615
barrier = module->getFunction("llvm.nvvm.barrier.cta.sync.aligned.all");
internal_assert(barrier) << "Could not find PTX barrier intrinsic llvm.nvvm.barrier0 nor llvm.nvvm.barrier.cta.sync.aligned.all\n";
builder->CreateCall(barrier0, builder->getInt32(0));
}
value = ConstantInt::get(i32_t, 0);
return;
}
Expand Down
1 change: 1 addition & 0 deletions src/runtime/ptx_dev.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
declare void @llvm.nvvm.barrier0()
declare void @llvm.nvvm.barrier.cta.sync.aligned.all(i32)
declare i32 @llvm.nvvm.read.ptx.sreg.tid.x()
declare i32 @llvm.nvvm.read.ptx.sreg.ctaid.x()
declare i32 @llvm.nvvm.read.ptx.sreg.ntid.x()
Expand Down
Loading