Skip to content

[OMPIRBuilder][NFC] Fix build failure after 151306. #153061

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 2 commits into from
Aug 11, 2025
Merged

[OMPIRBuilder][NFC] Fix build failure after 151306. #153061

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
626e016
[OMPIRBuilder] Fix build failure after 151306.
abidh Aug 11, 2025
0b623ed
Merge branch 'main' into build_fix
abidh Aug 11, 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
24 changes: 12 additions & 12 deletions llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,18 +92,6 @@ static bool isConflictIP(IRBuilder<>::InsertPoint IP1,
return IP1.getBlock() == IP2.getBlock() && IP1.getPoint() == IP2.getPoint();
}

/// This is wrapper over IRBuilderBase::restoreIP that also restores the current
/// debug location to the last instruction in the specified basic block if the
/// insert point points to the end of the block.
static void restoreIPandDebugLoc(llvm::IRBuilderBase &Builder,
llvm::IRBuilderBase::InsertPoint IP) {
Builder.restoreIP(IP);
llvm::BasicBlock *BB = Builder.GetInsertBlock();
llvm::BasicBlock::iterator I = Builder.GetInsertPoint();
if (!BB->empty() && I == BB->end())
Builder.SetCurrentDebugLocation(BB->back().getStableDebugLoc());
}

static bool isValidWorkshareLoopScheduleType(OMPScheduleType SchedType) {
// Valid ordered/unordered and base algorithm combinations.
switch (SchedType & ~OMPScheduleType::MonotonicityMask) {
Expand Down Expand Up @@ -163,6 +151,18 @@ static bool isValidWorkshareLoopScheduleType(OMPScheduleType SchedType) {
}
#endif

/// This is wrapper over IRBuilderBase::restoreIP that also restores the current
/// debug location to the last instruction in the specified basic block if the
/// insert point points to the end of the block.
static void restoreIPandDebugLoc(llvm::IRBuilderBase &Builder,
llvm::IRBuilderBase::InsertPoint IP) {
Builder.restoreIP(IP);
llvm::BasicBlock *BB = Builder.GetInsertBlock();
llvm::BasicBlock::iterator I = Builder.GetInsertPoint();
if (!BB->empty() && I == BB->end())
Builder.SetCurrentDebugLocation(BB->back().getStableDebugLoc());
}

static const omp::GV &getGridValue(const Triple &T, Function *Kernel) {
if (T.isAMDGPU()) {
StringRef Features =
Expand Down