[llvm] [mlir] [MLIR][OpenMP] Add MLIR Lowering Support for dist_schedule (PR #152736)
via llvm-commits
llvm-commits at lists.llvm.org
Fri Aug 8 08:00:42 PDT 2025
github-actions[bot] wrote:
<!--LLVM CODE FORMAT COMMENT: {clang-format}-->
:warning: C/C++ code formatter, clang-format found issues in your code. :warning:
<details>
<summary>
You can test this locally with the following command:
</summary>
``````````bash
git-clang-format --diff HEAD~1 HEAD --extensions h,cpp -- llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
``````````
</details>
<details>
<summary>
View the diff from clang-format here.
</summary>
``````````diff
diff --git a/llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h b/llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h
index 395df392b..41c2e2156 100644
--- a/llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h
+++ b/llvm/include/llvm/Frontend/OpenMP/OMPIRBuilder.h
@@ -1096,13 +1096,17 @@ private:
/// \param NeedsBarrier Indicates whether a barrier must be inserted after
/// the loop.
/// \param LoopType Type of workshare loop.
- /// \param HasDistSchedule Defines if the clause being lowered is dist_schedule as this is handled slightly differently
- /// \param DistScheduleSchedType Defines the Schedule Type for the Distribute loop. Defaults to None if no Distribute loop is present.
+ /// \param HasDistSchedule Defines if the clause being lowered is
+ /// dist_schedule as this is handled slightly differently
+ /// \param DistScheduleSchedType Defines the Schedule Type for the Distribute
+ /// loop. Defaults to None if no Distribute loop is present.
///
/// \returns Point where to insert code after the workshare construct.
InsertPointOrErrorTy applyStaticWorkshareLoop(
DebugLoc DL, CanonicalLoopInfo *CLI, InsertPointTy AllocaIP,
- omp::WorksharingLoopType LoopType, bool NeedsBarrier, bool HasDistSchedule = false, omp::OMPScheduleType DistScheduleSchedType = omp::OMPScheduleType::None);
+ omp::WorksharingLoopType LoopType, bool NeedsBarrier,
+ bool HasDistSchedule = false,
+ omp::OMPScheduleType DistScheduleSchedType = omp::OMPScheduleType::None);
/// Modifies the canonical loop a statically-scheduled workshare loop with a
/// user-specified chunk size.
@@ -1115,20 +1119,22 @@ private:
/// \param NeedsBarrier Indicates whether a barrier must be inserted after the
/// loop.
/// \param ChunkSize The user-specified chunk size.
- /// \param SchedType Optional type of scheduling to be passed to the init function.
- /// \param DistScheduleChunkSize The size of dist_shcedule chunk considered as a unit when
+ /// \param SchedType Optional type of scheduling to be passed to the init
+ /// function.
+ /// \param DistScheduleChunkSize The size of dist_shcedule chunk considered
+ /// as a unit when
/// scheduling. If \p nullptr, defaults to 1.
- /// \param DistScheduleSchedType Defines the Schedule Type for the Distribute loop. Defaults to None if no Distribute loop is present.
+ /// \param DistScheduleSchedType Defines the Schedule Type for the Distribute
+ /// loop. Defaults to None if no Distribute loop is present.
///
/// \returns Point where to insert code after the workshare construct.
- InsertPointOrErrorTy applyStaticChunkedWorkshareLoop(DebugLoc DL,
- CanonicalLoopInfo *CLI,
- InsertPointTy AllocaIP,
- bool NeedsBarrier,
- Value *ChunkSize,
- omp::OMPScheduleType SchedType = omp::OMPScheduleType::UnorderedStaticChunked,
- Value *DistScheduleChunkSize = nullptr,
- omp::OMPScheduleType DistScheduleSchedType = omp::OMPScheduleType::None);
+ InsertPointOrErrorTy applyStaticChunkedWorkshareLoop(
+ DebugLoc DL, CanonicalLoopInfo *CLI, InsertPointTy AllocaIP,
+ bool NeedsBarrier, Value *ChunkSize,
+ omp::OMPScheduleType SchedType =
+ omp::OMPScheduleType::UnorderedStaticChunked,
+ Value *DistScheduleChunkSize = nullptr,
+ omp::OMPScheduleType DistScheduleSchedType = omp::OMPScheduleType::None);
/// Modifies the canonical loop to be a dynamically-scheduled workshare loop.
///
@@ -1148,17 +1154,15 @@ private:
/// the loop.
/// \param Chunk The size of loop chunk considered as a unit when
/// scheduling. If \p nullptr, defaults to 1.
- /// \param DistScheduleChunk The size of dist_shcedule chunk considered as a unit when
+ /// \param DistScheduleChunk The size of dist_shcedule chunk considered as
+ /// a unit when
/// scheduling. If \p nullptr, defaults to 1.
///
/// \returns Point where to insert code after the workshare construct.
- InsertPointOrErrorTy applyDynamicWorkshareLoop(DebugLoc DL,
- CanonicalLoopInfo *CLI,
- InsertPointTy AllocaIP,
- omp::OMPScheduleType SchedType,
- bool NeedsBarrier,
- Value *Chunk = nullptr,
- Value *DistScheduleChunk = nullptr);
+ InsertPointOrErrorTy applyDynamicWorkshareLoop(
+ DebugLoc DL, CanonicalLoopInfo *CLI, InsertPointTy AllocaIP,
+ omp::OMPScheduleType SchedType, bool NeedsBarrier, Value *Chunk = nullptr,
+ Value *DistScheduleChunk = nullptr);
/// Create alternative version of the loop to support if clause
///
@@ -1209,7 +1213,8 @@ public:
/// present.
/// \param LoopType Information about type of loop worksharing.
/// It corresponds to type of loop workshare OpenMP pragma.
- /// \param HasDistSchedule Defines if the clause being lowered is dist_schedule as this is handled slightly differently
+ /// \param HasDistSchedule Defines if the clause being lowered is
+ /// dist_schedule as this is handled slightly differently
///
/// \param ChunkSize The chunk size for dist_schedule loop
///
@@ -1223,8 +1228,7 @@ public:
bool HasOrderedClause = false,
omp::WorksharingLoopType LoopType =
omp::WorksharingLoopType::ForStaticLoop,
- bool HasDistSchedule = false,
- Value* DistScheduleChunkSize = nullptr);
+ bool HasDistSchedule = false, Value *DistScheduleChunkSize = nullptr);
/// Tile a loop nest.
///
diff --git a/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp b/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
index 18da0d772..1860ade26 100644
--- a/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
+++ b/llvm/lib/Frontend/OpenMP/OMPIRBuilder.cpp
@@ -4761,9 +4761,12 @@ OpenMPIRBuilder::InsertPointOrErrorTy OpenMPIRBuilder::applyStaticWorkshareLoop(
static void addAccessGroupMetadata(BasicBlock *Block, MDNode *AccessGroup,
LoopInfo &LI);
static void addLoopMetadata(CanonicalLoopInfo *Loop,
-ArrayRef<Metadata *> Properties);
+ ArrayRef<Metadata *> Properties);
-static void applyParallelAccessesMetadata(CanonicalLoopInfo *CLI, LLVMContext &Ctx, Loop *Loop, LoopInfo &LoopInfo, SmallVector<Metadata *> &LoopMDList) {
+static void applyParallelAccessesMetadata(CanonicalLoopInfo *CLI,
+ LLVMContext &Ctx, Loop *Loop,
+ LoopInfo &LoopInfo,
+ SmallVector<Metadata *> &LoopMDList) {
SmallSet<BasicBlock *, 8> Reachable;
// Get the basic blocks from the loop in which memref instructions
@@ -4771,8 +4774,7 @@ static void applyParallelAccessesMetadata(CanonicalLoopInfo *CLI, LLVMContext &C
// TODO: Generalize getting all blocks inside a CanonicalizeLoopInfo,
// preferably without running any passes.
for (BasicBlock *Block : Loop->getBlocks()) {
- if (Block == CLI->getCond() ||
- Block == CLI->getHeader())
+ if (Block == CLI->getCond() || Block == CLI->getHeader())
continue;
Reachable.insert(Block);
}
diff --git a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
index e5f3ddd30..b11af583f 100644
--- a/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
+++ b/mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp
@@ -2494,8 +2494,8 @@ convertOmpWsloop(Operation &opInst, llvm::IRBuilderBase &builder,
distributeOp = cast<omp::DistributeOp>(opInst.getParentOp());
hasDistSchedule = distributeOp.getDistScheduleStatic();
if (distributeOp.getDistScheduleChunkSize()) {
- llvm::Value *chunkVar =
- moduleTranslation.lookupValue(distributeOp.getDistScheduleChunkSize());
+ llvm::Value *chunkVar = moduleTranslation.lookupValue(
+ distributeOp.getDistScheduleChunkSize());
distScheduleChunk = builder.CreateSExtOrTrunc(chunkVar, ivType);
}
}
``````````
</details>
https://github.com/llvm/llvm-project/pull/152736
More information about the llvm-commits
mailing list