Skip to content

Commit 5fa55b2

Browse files
authored
Revert "[flang][OpenMP] Skip runtime mapping with no offload targets (#144534)" (#145478)
And also revert 6ba1955 "[flang][OpenMP] Fix ignore-target-data.f90 test" As it causes several bot failures #144534 (comment)
1 parent 73e4f8a commit 5fa55b2

File tree

5 files changed

+183
-245
lines changed

5 files changed

+183
-245
lines changed

flang/test/Lower/OpenMP/ignore-target-data.f90

Lines changed: 0 additions & 30 deletions
This file was deleted.

mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4378,9 +4378,6 @@ convertOmpTargetData(Operation *op, llvm::IRBuilderBase &builder,
43784378
llvm::OpenMPIRBuilder *ompBuilder = moduleTranslation.getOpenMPBuilder();
43794379
llvm::OpenMPIRBuilder::TargetDataInfo info(/*RequiresDevicePointerInfo=*/true,
43804380
/*SeparateBeginEndCalls=*/true);
4381-
bool isTargetDevice = ompBuilder->Config.isTargetDevice();
4382-
bool isOffloadEntry =
4383-
isTargetDevice || !ompBuilder->Config.TargetTriples.empty();
43844381

43854382
LogicalResult result =
43864383
llvm::TypeSwitch<Operation *, LogicalResult>(op)
@@ -4470,9 +4467,6 @@ convertOmpTargetData(Operation *op, llvm::IRBuilderBase &builder,
44704467

44714468
if (failed(result))
44724469
return failure();
4473-
// Pretend we have IF(false) if we're not doing offload.
4474-
if (!isOffloadEntry)
4475-
ifCond = builder.getFalse();
44764470

44774471
using InsertPointTy = llvm::OpenMPIRBuilder::InsertPointTy;
44784472
MapInfoData mapData;

0 commit comments

Comments
 (0)