[Mlir-commits] [mlir] 875074c - [OpenMP][MLIR] Conversion pattern for OpenMP to LLVM
Kiran Chandramohan
llvmlistbot at llvm.org
Thu Aug 27 11:43:23 PDT 2020
Author: Kiran Chandramohan
Date: 2020-08-27T19:32:15+01:00
New Revision: 875074c8a93d71b3e246da4bae983ec7524f4f28
URL: https://github.com/llvm/llvm-project/commit/875074c8a93d71b3e246da4bae983ec7524f4f28
DIFF: https://github.com/llvm/llvm-project/commit/875074c8a93d71b3e246da4bae983ec7524f4f28.diff
LOG: [OpenMP][MLIR] Conversion pattern for OpenMP to LLVM
Adding a conversion pattern for the parallel Operation. This will
help the conversion of parallel operation with standard dialect to
parallel operation with llvm dialect. The type conversion of the block
arguments in a parallel region are controlled by the pattern for the
parallel Operation. Without this pattern, a parallel Operation with
block arguments cannot be converted from standard to LLVM dialect.
Other OpenMP operations without regions are marked as legal. When
translation of OpenMP operations with regions are added then patterns
for these operations can also be added.
Also uses all the standard to llvm patterns. Patterns of other dialects
can be added later if needed.
Reviewed By: rriddle
Differential Revision: https://reviews.llvm.org/D86273
Added:
mlir/include/mlir/Conversion/OpenMPToLLVM/ConvertOpenMPToLLVM.h
mlir/lib/Conversion/OpenMPToLLVM/CMakeLists.txt
mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp
mlir/test/Conversion/OpenMPToLLVM/convert-to-llvmir.mlir
Modified:
mlir/include/mlir/Conversion/Passes.h
mlir/include/mlir/Conversion/Passes.td
mlir/lib/Conversion/CMakeLists.txt
Removed:
################################################################################
diff --git a/mlir/include/mlir/Conversion/OpenMPToLLVM/ConvertOpenMPToLLVM.h b/mlir/include/mlir/Conversion/OpenMPToLLVM/ConvertOpenMPToLLVM.h
new file mode 100644
index 000000000000..ace07ac7223b
--- /dev/null
+++ b/mlir/include/mlir/Conversion/OpenMPToLLVM/ConvertOpenMPToLLVM.h
@@ -0,0 +1,31 @@
+//===- OpenMPToLLVM.h - Utils to convert from the OpenMP dialect ----------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+#ifndef MLIR_CONVERSION_OPENMPTOLLVM_OPENMPTOLLVM_H_
+#define MLIR_CONVERSION_OPENMPTOLLVM_OPENMPTOLLVM_H_
+
+#include<memory>
+
+namespace mlir {
+class LLVMTypeConverter;
+class MLIRContext;
+class ModuleOp;
+template <typename T>
+class OperationPass;
+class OwningRewritePatternList;
+
+/// Populate the given list with patterns that convert from OpenMP to LLVM.
+void populateOpenMPToLLVMConversionPatterns(MLIRContext *context,
+ LLVMTypeConverter &converter,
+ OwningRewritePatternList &patterns);
+
+/// Create a pass to convert OpenMP operations to the LLVMIR dialect.
+std::unique_ptr<OperationPass<ModuleOp>> createConvertOpenMPToLLVMPass();
+
+} // namespace mlir
+
+#endif // MLIR_CONVERSION_OPENMPTOLLVM_OPENMPTOLLVM_H_
diff --git a/mlir/include/mlir/Conversion/Passes.h b/mlir/include/mlir/Conversion/Passes.h
index 87f2c97e766d..5dd10932981b 100644
--- a/mlir/include/mlir/Conversion/Passes.h
+++ b/mlir/include/mlir/Conversion/Passes.h
@@ -19,6 +19,7 @@
#include "mlir/Conversion/LinalgToLLVM/LinalgToLLVM.h"
#include "mlir/Conversion/LinalgToSPIRV/LinalgToSPIRVPass.h"
#include "mlir/Conversion/LinalgToStandard/LinalgToStandard.h"
+#include "mlir/Conversion/OpenMPToLLVM/ConvertOpenMPToLLVM.h"
#include "mlir/Conversion/SCFToGPU/SCFToGPUPass.h"
#include "mlir/Conversion/SCFToStandard/SCFToStandard.h"
#include "mlir/Conversion/SPIRVToLLVM/ConvertSPIRVToLLVMPass.h"
diff --git a/mlir/include/mlir/Conversion/Passes.td b/mlir/include/mlir/Conversion/Passes.td
index 0a043c01e981..6686e2865813 100644
--- a/mlir/include/mlir/Conversion/Passes.td
+++ b/mlir/include/mlir/Conversion/Passes.td
@@ -188,6 +188,16 @@ def ConvertLinalgToSPIRV : Pass<"convert-linalg-to-spirv", "ModuleOp"> {
let dependentDialects = ["spirv::SPIRVDialect"];
}
+//===----------------------------------------------------------------------===//
+// OpenMPToLLVM
+//===----------------------------------------------------------------------===//
+
+def ConvertOpenMPToLLVM : Pass<"convert-openmp-to-llvm", "ModuleOp"> {
+ let summary = "Convert the OpenMP ops to OpenMP ops with LLVM dialect";
+ let constructor = "mlir::createConvertOpenMPToLLVMPass()";
+ let dependentDialects = ["LLVM::LLVMDialect"];
+}
+
//===----------------------------------------------------------------------===//
// SCFToStandard
//===----------------------------------------------------------------------===//
diff --git a/mlir/lib/Conversion/CMakeLists.txt b/mlir/lib/Conversion/CMakeLists.txt
index 57602881ab7c..c2bb2130569d 100644
--- a/mlir/lib/Conversion/CMakeLists.txt
+++ b/mlir/lib/Conversion/CMakeLists.txt
@@ -8,6 +8,7 @@ add_subdirectory(GPUToVulkan)
add_subdirectory(LinalgToLLVM)
add_subdirectory(LinalgToSPIRV)
add_subdirectory(LinalgToStandard)
+add_subdirectory(OpenMPToLLVM)
add_subdirectory(SCFToGPU)
add_subdirectory(SCFToSPIRV)
add_subdirectory(SCFToStandard)
diff --git a/mlir/lib/Conversion/OpenMPToLLVM/CMakeLists.txt b/mlir/lib/Conversion/OpenMPToLLVM/CMakeLists.txt
new file mode 100644
index 000000000000..c9cf7883a0ab
--- /dev/null
+++ b/mlir/lib/Conversion/OpenMPToLLVM/CMakeLists.txt
@@ -0,0 +1,20 @@
+add_mlir_conversion_library(MLIROpenMPToLLVM
+ OpenMPToLLVM.cpp
+
+ ADDITIONAL_HEADER_DIRS
+ ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/OpenMPToLLVM
+
+ DEPENDS
+ MLIRConversionPassIncGen
+ intrinsics_gen
+
+ LINK_COMPONENTS
+ Core
+
+ LINK_LIBS PUBLIC
+ MLIRIR
+ MLIRLLVMIR
+ MLIROpenMP
+ MLIRStandardToLLVM
+ MLIRTransforms
+ )
diff --git a/mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp b/mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp
new file mode 100644
index 000000000000..41c8ac1ec390
--- /dev/null
+++ b/mlir/lib/Conversion/OpenMPToLLVM/OpenMPToLLVM.cpp
@@ -0,0 +1,76 @@
+//===- OpenMPToLLVM.cpp - conversion from OpenMP to LLVM dialect ----------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "mlir/Conversion/OpenMPToLLVM/ConvertOpenMPToLLVM.h"
+
+#include "../PassDetail.h"
+#include "mlir/Conversion/StandardToLLVM/ConvertStandardToLLVM.h"
+#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
+#include "mlir/Dialect/OpenMP/OpenMPDialect.h"
+
+using namespace mlir;
+
+namespace {
+struct ParallelOpConversion : public ConvertToLLVMPattern {
+ explicit ParallelOpConversion(MLIRContext *context,
+ LLVMTypeConverter &typeConverter)
+ : ConvertToLLVMPattern(omp::ParallelOp::getOperationName(), context,
+ typeConverter) {}
+
+ LogicalResult
+ matchAndRewrite(Operation *op, ArrayRef<Value> operands,
+ ConversionPatternRewriter &rewriter) const override {
+ auto curOp = cast<omp::ParallelOp>(op);
+ auto newOp = rewriter.create<omp::ParallelOp>(
+ curOp.getLoc(), ArrayRef<Type>(), operands, curOp.getAttrs());
+ rewriter.inlineRegionBefore(curOp.region(), newOp.region(),
+ newOp.region().end());
+ if (failed(rewriter.convertRegionTypes(&newOp.region(), typeConverter)))
+ return failure();
+
+ rewriter.eraseOp(op);
+ return success();
+ }
+};
+} // namespace
+
+void mlir::populateOpenMPToLLVMConversionPatterns(
+ MLIRContext *context, LLVMTypeConverter &converter,
+ OwningRewritePatternList &patterns) {
+ patterns.insert<ParallelOpConversion>(context, converter);
+}
+
+namespace {
+struct ConvertOpenMPToLLVMPass
+ : public ConvertOpenMPToLLVMBase<ConvertOpenMPToLLVMPass> {
+ void runOnOperation() override;
+};
+} // namespace
+
+void ConvertOpenMPToLLVMPass::runOnOperation() {
+ auto module = getOperation();
+ MLIRContext *context = &getContext();
+
+ // Convert to OpenMP operations with LLVM IR dialect
+ OwningRewritePatternList patterns;
+ LLVMTypeConverter converter(&getContext());
+ populateStdToLLVMConversionPatterns(converter, patterns);
+ populateOpenMPToLLVMConversionPatterns(context, converter, patterns);
+
+ LLVMConversionTarget target(getContext());
+ target.addDynamicallyLegalOp<omp::ParallelOp>(
+ [&](omp::ParallelOp op) { return converter.isLegal(&op.getRegion()); });
+ target.addLegalOp<omp::TerminatorOp, omp::TaskyieldOp, omp::FlushOp,
+ omp::BarrierOp, omp::TaskwaitOp>();
+ if (failed(applyPartialConversion(module, target, patterns)))
+ signalPassFailure();
+}
+
+std::unique_ptr<OperationPass<ModuleOp>> mlir::createConvertOpenMPToLLVMPass() {
+ return std::make_unique<ConvertOpenMPToLLVMPass>();
+}
diff --git a/mlir/test/Conversion/OpenMPToLLVM/convert-to-llvmir.mlir b/mlir/test/Conversion/OpenMPToLLVM/convert-to-llvmir.mlir
new file mode 100644
index 000000000000..d38a6ea7e3a9
--- /dev/null
+++ b/mlir/test/Conversion/OpenMPToLLVM/convert-to-llvmir.mlir
@@ -0,0 +1,30 @@
+// RUN: mlir-opt -convert-openmp-to-llvm %s -split-input-file | FileCheck %s
+
+// CHECK-LABEL: llvm.func @branch_loop
+func @branch_loop() {
+ %start = constant 0 : index
+ %end = constant 0 : index
+ // CHECK: omp.parallel
+ omp.parallel {
+ // CHECK-NEXT: llvm.br ^[[BB1:.*]](%{{[0-9]+}}, %{{[0-9]+}} : !llvm.i64, !llvm.i64
+ br ^bb1(%start, %end : index, index)
+ // CHECK-NEXT: ^[[BB1]](%[[ARG1:[0-9]+]]: !llvm.i64, %[[ARG2:[0-9]+]]: !llvm.i64):{{.*}}
+ ^bb1(%0: index, %1: index):
+ // CHECK-NEXT: %[[CMP:[0-9]+]] = llvm.icmp "slt" %[[ARG1]], %[[ARG2]] : !llvm.i64
+ %2 = cmpi "slt", %0, %1 : index
+ // CHECK-NEXT: llvm.cond_br %[[CMP]], ^[[BB2:.*]](%{{[0-9]+}}, %{{[0-9]+}} : !llvm.i64, !llvm.i64), ^[[BB3:.*]]
+ cond_br %2, ^bb2(%end, %end : index, index), ^bb3
+ // CHECK-NEXT: ^[[BB2]](%[[ARG3:[0-9]+]]: !llvm.i64, %[[ARG4:[0-9]+]]: !llvm.i64):
+ ^bb2(%3: index, %4: index):
+ // CHECK-NEXT: llvm.br ^[[BB1]](%[[ARG3]], %[[ARG4]] : !llvm.i64, !llvm.i64)
+ br ^bb1(%3, %4 : index, index)
+ // CHECK-NEXT: ^[[BB3]]:
+ ^bb3:
+ omp.flush
+ omp.barrier
+ omp.taskwait
+ omp.taskyield
+ omp.terminator
+ }
+ return
+}
More information about the Mlir-commits
mailing list