Skip to content

[flang][cuda] Use local scope to avoid duplicate definition #166249

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
merged 1 commit into from
Nov 3, 2025
+16 −11
Merged

[flang][cuda] Use local scope to avoid duplicate definition #166249

Show file tree
Hide file tree
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
23 changes: 14 additions & 9 deletions flang/lib/Optimizer/Builder/IntrinsicCall.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3392,13 +3392,15 @@ IntrinsicLibrary::genBarrierTryWait(mlir::Type resultType,
builder.setInsertionPointToStart(afterBlock);
auto llvmPtrTy = mlir::LLVM::LLVMPointerType::get(builder.getContext());
auto barrier = builder.createConvert(loc, llvmPtrTy, args[0]);
mlir::Value ret =
mlir::NVVM::InlinePtxOp::create(
builder, loc, {resultType}, {barrier, args[1], ns}, {},
".reg .pred p; mbarrier.try_wait.shared.b64 p, [%1], %2, %3; "
"selp.b32 %0, 1, 0, p;",
{})
.getResult(0);
mlir::Value ret = mlir::NVVM::InlinePtxOp::create(
builder, loc, {resultType}, {barrier, args[1], ns}, {},
"{\n"
" .reg .pred p;\n"
" mbarrier.try_wait.shared.b64 p, [%1], %2, %3;\n"
" selp.b32 %0, 1, 0, p;\n"
"}",
{})
.getResult(0);
mlir::scf::YieldOp::create(builder, loc, ret);
builder.setInsertionPointAfter(whileOp);
return whileOp.getResult(0);
Expand All @@ -3413,8 +3415,11 @@ IntrinsicLibrary::genBarrierTryWaitSleep(mlir::Type resultType,
auto barrier = builder.createConvert(loc, llvmPtrTy, args[0]);
return mlir::NVVM::InlinePtxOp::create(
builder, loc, {resultType}, {barrier, args[1], args[2]}, {},
".reg .pred p; mbarrier.try_wait.shared.b64 p, [%1], %2, %3; "
"selp.b32 %0, 1, 0, p;",
"{\n"
" .reg .pred p;\n"
" mbarrier.try_wait.shared.b64 p, [%1], %2, %3;\n"
" selp.b32 %0, 1, 0, p;\n"
"}",
{})
.getResult(0);
}
Expand Down
4 changes: 2 additions & 2 deletions flang/test/Lower/CUDA/cuda-device-proc.cuf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ end subroutine

! CHECK-LABEL: func.func @_QPtest_barrier_try_wait()
! CHECK: scf.while
! CHECK: %{{.*}} = nvvm.inline_ptx ".reg .pred p; mbarrier.try_wait.shared.b64 p, [%{{.*}}], %{{.*}}, %{{.*}}; selp.b32 %{{.*}}, 1, 0, p;" ro(%{{.*}}, %{{.*}}, %c1000000{{.*}} : !llvm.ptr, i64, i32) -> i32
! CHECK: %{{.*}} = nvvm.inline_ptx "{\0A .reg .pred p;\0A mbarrier.try_wait.shared.b64 p, [%{{.*}}], %{{.*}}, %{{.*}};\0A selp.b32 %{{.*}}, 1, 0, p;\0A}" ro(%{{.*}}, %{{.*}}, %{{.*}} : !llvm.ptr, i64, i32) -> i32

attributes(global) subroutine test_barrier_try_wait_sleep()
integer :: istat
Expand All @@ -526,7 +526,7 @@ attributes(global) subroutine test_barrier_try_wait_sleep()
end subroutine

! CHECK-LABEL: func.func @_QPtest_barrier_try_wait_sleep()
! CHECK: %{{.*}} = nvvm.inline_ptx ".reg .pred p; mbarrier.try_wait.shared.b64 p, [%{{.*}}], %{{.*}}, %{{.*}}; selp.b32 %0, 1, 0, p;" ro(%{{.*}}, %{{.*}}, %{{.*}} : !llvm.ptr, i64, i32) -> i32
! CHECK: %{{.*}} = nvvm.inline_ptx "{\0A .reg .pred p;\0A mbarrier.try_wait.shared.b64 p, [%{{.*}}], %{{.*}}, %{{.*}};\0A selp.b32 %{{.*}}, 1, 0, p;\0A}" ro(%{{.*}}, %{{.*}}, %{{.*}} : !llvm.ptr, i64, i32) -> i32

attributes(global) subroutine test_tma_bulk_load_c4(a, n)
integer(8), shared :: barrier1
Expand Down
Loading