Meinersbur created this revision.
Meinersbur added reviewers: jdoerfert, kiranchandramohan, peixin, clementval,
Leporacanthicus, kiranktp, AMDChirag, fghanim, jdenny, MatsPetersson, ftynse.
Herald added subscribers: awarzynski, sdasgup3, wenzhicui, wrengr,
Chia-hungDuan, dcaballe, cota, teijeong, rdzhabarov, tatianashp, msifontes,
jurahul, Kayjukh, grosul1, Joonsoo, liufengdb, aartbik, lucyrfox, mgester,
arpith-jacob, antiagainst, shauheen, rriddle, mehdi_amini, guansong, hiraditya,
yaxunl.
Meinersbur requested review of this revision.
Herald added subscribers: llvm-commits, sstefan1, stephenneuendorffer,
nicolasvasilache.
Herald added projects: MLIR, LLVM.
Follow-up on D117226 <https://reviews.llvm.org/D117226> for createSections.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D117835
Files:
llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp
mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
mlir/test/Target/LLVMIR/openmp-llvm.mlir
Index: mlir/test/Target/LLVMIR/openmp-llvm.mlir
===================================================================
--- mlir/test/Target/LLVMIR/openmp-llvm.mlir
+++ mlir/test/Target/LLVMIR/openmp-llvm.mlir
@@ -842,6 +842,9 @@
// CHECK-LABEL: @omp_sections_trivial
llvm.func @omp_sections_trivial() -> () {
+ // CHECK: br label %[[ENTRY:[a-zA-Z_.]+]]
+
+ // CHECK: [[ENTRY]]:
// CHECK: br label %[[PREHEADER:.*]]
// CHECK: [[PREHEADER]]:
Index: mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
===================================================================
--- mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
+++ mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
@@ -66,7 +66,24 @@
if (walkResult.wasInterrupted())
return allocaInsertPoint;
- // Otherwise, insert to the entry block of the surrounding function.
+ // Otherwise, insert to the entry block of the surrounding function.s
+ // If the current IRBuilder InsertPoint is the function's entry, it cannot
+ // also be used for alloca insertion which would result in insertion order
+ // confusion. Create a new BasicBlock for the Builder and use the entry block
+ // for the allocs.
+ // TODO: Create a dedicated alloca BasicBlock at function creation such that
+ // we do not need to move the current InertPoint here.
+ if (builder.GetInsertBlock() ==
+ &builder.GetInsertBlock()->getParent()->getEntryBlock()) {
+ assert(builder.GetInsertPoint() == builder.GetInsertBlock()->end() &&
+ "Assuming end of basic block");
+ llvm::BasicBlock *entryBB = llvm::BasicBlock::Create(
+ builder.getContext(), "entry", builder.GetInsertBlock()->getParent(),
+ builder.GetInsertBlock()->getNextNode());
+ builder.CreateBr(entryBB);
+ builder.SetInsertPoint(entryBB);
+ }
+
llvm::BasicBlock &funcEntryBlock =
builder.GetInsertBlock()->getParent()->getEntryBlock();
return llvm::OpenMPIRBuilder::InsertPointTy(
@@ -249,24 +266,13 @@
// TODO: Is the Parallel construct cancellable?
bool isCancellable = false;
- // Ensure that the BasicBlock for the the parallel region is sparate from the
- // function entry which we may need to insert allocas.
- if (builder.GetInsertBlock() ==
- &builder.GetInsertBlock()->getParent()->getEntryBlock()) {
- assert(builder.GetInsertPoint() == builder.GetInsertBlock()->end() &&
- "Assuming end of basic block");
- llvm::BasicBlock *entryBB =
- llvm::BasicBlock::Create(builder.getContext(), "parallel.entry",
- builder.GetInsertBlock()->getParent(),
- builder.GetInsertBlock()->getNextNode());
- builder.CreateBr(entryBB);
- builder.SetInsertPoint(entryBB);
- }
+ llvm::OpenMPIRBuilder::InsertPointTy allocaIP =
+ findAllocaInsertPoint(builder, moduleTranslation);
llvm::OpenMPIRBuilder::LocationDescription ompLoc(
builder.saveIP(), builder.getCurrentDebugLocation());
builder.restoreIP(moduleTranslation.getOpenMPBuilder()->createParallel(
- ompLoc, findAllocaInsertPoint(builder, moduleTranslation), bodyGenCB,
- privCB, finiCB, ifCond, numThreads, pbKind, isCancellable));
+ ompLoc, allocaIP, bodyGenCB, privCB, finiCB, ifCond, numThreads, pbKind,
+ isCancellable));
return bodyGenStatus;
}
@@ -528,9 +534,10 @@
storeValues.push_back(vecValues[indexVecValues]);
indexVecValues++;
}
+ llvm::OpenMPIRBuilder::InsertPointTy allocaIP =
+ findAllocaInsertPoint(builder, moduleTranslation);
builder.restoreIP(moduleTranslation.getOpenMPBuilder()->createOrderedDepend(
- ompLoc, findAllocaInsertPoint(builder, moduleTranslation), numLoops,
- storeValues, ".cnt.addr", isDependSource));
+ ompLoc, allocaIP, numLoops, storeValues, ".cnt.addr", isDependSource));
}
return success();
}
@@ -635,11 +642,13 @@
// called for variables which have destructors/finalizers.
auto finiCB = [&](InsertPointTy codeGenIP) {};
+ llvm::OpenMPIRBuilder::InsertPointTy allocaIP =
+ findAllocaInsertPoint(builder, moduleTranslation);
llvm::OpenMPIRBuilder::LocationDescription ompLoc(
builder.saveIP(), builder.getCurrentDebugLocation());
builder.restoreIP(moduleTranslation.getOpenMPBuilder()->createSections(
- ompLoc, findAllocaInsertPoint(builder, moduleTranslation), sectionCBs,
- privCB, finiCB, false, sectionsOp.nowait()));
+ ompLoc, allocaIP, sectionCBs, privCB, finiCB, false,
+ sectionsOp.nowait()));
return bodyGenStatus;
}
Index: llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp
===================================================================
--- llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp
+++ llvm/unittests/Frontend/OpenMPIRBuilderTest.cpp
@@ -3548,7 +3548,12 @@
OMPBuilder.initialize();
F->setName("func");
IRBuilder<> Builder(BB);
+
+ BasicBlock *EnterBB = BasicBlock::Create(Ctx, "sections.enter", F);
+ Builder.CreateBr(EnterBB);
+ Builder.SetInsertPoint(EnterBB);
OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
+
llvm::SmallVector<BodyGenCallbackTy, 4> SectionCBVector;
llvm::SmallVector<BasicBlock *, 4> CaseBBs;
@@ -3703,7 +3708,11 @@
F->setName("func");
IRBuilder<> Builder(BB);
+ BasicBlock *EnterBB = BasicBlock::Create(Ctx, "sections.enter", F);
+ Builder.CreateBr(EnterBB);
+ Builder.SetInsertPoint(EnterBB);
OpenMPIRBuilder::LocationDescription Loc({Builder.saveIP(), DL});
+
IRBuilder<>::InsertPoint AllocaIP(&F->getEntryBlock(),
F->getEntryBlock().getFirstInsertionPt());
llvm::SmallVector<BodyGenCallbackTy, 4> SectionCBVector;
Index: llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
===================================================================
--- llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
+++ llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
@@ -959,6 +959,8 @@
const LocationDescription &Loc, InsertPointTy AllocaIP,
ArrayRef<StorableBodyGenCallbackTy> SectionCBs, PrivatizeCallbackTy PrivCB,
FinalizeCallbackTy FiniCB, bool IsCancellable, bool IsNowait) {
+ assert(!isConflictIP(AllocaIP, Loc.IP) && "Dedicated IP allocas required");
+
if (!updateToLocation(Loc))
return Loc.IP;
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
