Skip to content

[OpenMP] Fix target data region codegen being omitted for device pass #85218

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 3 commits into from
Mar 19, 2024
Merged

[OpenMP] Fix target data region codegen being omitted for device pass #85218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81e72ee
[OpenMP] Fix target data region codegen being ommitted for device pass
TIFitis Mar 14, 2024
6bbd9d9
Fix clang-format.
TIFitis Mar 14, 2024
b78fbb1
Added OpenMPIRBuilderTest for target-data device pass.
TIFitis Mar 18, 2024
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
5 changes: 4 additions & 1 deletion llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4791,8 +4791,11 @@ OpenMPIRBuilder::InsertPointTy OpenMPIRBuilder::createTargetData(
return InsertPointTy();

// Disable TargetData CodeGen on Device pass.
if (Config.IsTargetDevice.value_or(false))
if (Config.IsTargetDevice.value_or(false)) {
if (BodyGenCB)
Builder.restoreIP(BodyGenCB(Builder.saveIP(), BodyGenTy::NoPriv));
return Builder.saveIP();
}

Builder.restoreIP(CodeGenIP);
bool IsStandAlone = !BodyGenCB;
Expand Down
17 changes: 17 additions & 0 deletions llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5711,6 +5711,23 @@ TEST_F(OpenMPIRBuilderTest, TargetDataRegion) {
EXPECT_TRUE(TargetDataCall->getOperand(2)->getType()->isIntegerTy(32));
EXPECT_TRUE(TargetDataCall->getOperand(8)->getType()->isPointerTy());

// Check that BodyGenCB is still made when IsTargetDevice is set to true.
OMPBuilder.Config.setIsTargetDevice(true);
bool CheckDevicePassBodyGen = false;
auto BodyTargetCB = [&](InsertPointTy CodeGenIP, BodyGenTy BodyGenType) {
CheckDevicePassBodyGen = true;
Builder.restoreIP(CodeGenIP);
CallInst *TargetDataCall =
dyn_cast<CallInst>(BB->back().getPrevNode()->getPrevNode());
// Make sure no begin_mapper call is present for device pass.
EXPECT_EQ(TargetDataCall, nullptr);
return Builder.saveIP();
};
Builder.restoreIP(OMPBuilder.createTargetData(
Loc, AllocaIP, Builder.saveIP(), Builder.getInt64(DeviceID),
/* IfCond= */ nullptr, Info, GenMapInfoCB, nullptr, BodyTargetCB));
EXPECT_TRUE(CheckDevicePassBodyGen);

Builder.CreateRetVoid();
EXPECT_FALSE(verifyModule(*M, &errs()));
}
Expand Down
31 changes: 31 additions & 0 deletions openmp/libomptarget/test/offloading/fortran/target-nested-target-data.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
! Offloading test for target nested inside
! a target data region
! REQUIRES: flang
! UNSUPPORTED: nvptx64-nvidia-cuda-LTO
! UNSUPPORTED: aarch64-unknown-linux-gnu
! UNSUPPORTED: aarch64-unknown-linux-gnu-LTO
! UNSUPPORTED: x86_64-pc-linux-gnu
! UNSUPPORTED: x86_64-pc-linux-gnu-LTO

! RUN: %libomptarget-compile-fortran-run-and-check-generic
program main
integer :: A(10), B(10), C(10)

do I = 1, 10
A(I) = 1
B(I) = 2
end do
!$omp target data map(to: A, B) map(alloc: C)
!$omp target map(from: C)
do I = 1, 10
C(I) = A(I) + B(I) ! assigns 3, A:1 + B:2
end do
!$omp end target
!$omp target update from(C) ! updates C device -> host
!$omp end target data

print *, C ! should be all 3's

end program

! CHECK: 3 3 3 3 3 3 3 3 3 3
Loading