[flang-commits] [flang] [mlir] [mlir][OpenMP] Remove unnecessary dialect dependencies (PR #78220)
Fabian Mora via flang-commits
flang-commits at lists.llvm.org
Mon Jan 15 17:56:26 PST 2024
https://github.com/fabianmcg created https://github.com/llvm/llvm-project/pull/78220
This patch removes dialect dependencies from the OpenMP dialect; all external models were moved to independent libraries to accomplish this change. Consequently, OpenMP dialect users can pull only the desired external models; for example, a user might choose not to include OpenMP Func external models. However, all external models still reside inside the OpenMP dialect, as it's the owner of those interfaces.
Additionally, an external model was included for the GPUModule operation.
>From 11dbc670581a414dbeee2ff9a45dc8c2491b585c Mon Sep 17 00:00:00 2001
From: Fabian Mora <fmora.dev at gmail.com>
Date: Tue, 16 Jan 2024 01:46:37 +0000
Subject: [PATCH] [mlir][OpenMP] Remove unnecessary dialect dependencies
This patch removes dialect dependencies from the OpenMP dialect; all external
models were moved to independent libraries to accomplish this change.
Consequently, OpenMP dialect users can pull only the desired external models;
for example, a user might choose not to include OpenMP Func external models.
However, all external models still reside inside the OpenMP dialect, as it's
the owner of those interfaces.
Additionally, an external model was included for the GPUModule operation.
---
.../include/flang/Optimizer/Support/InitFIR.h | 4 ++
flang/lib/Optimizer/Transforms/CMakeLists.txt | 3 +
.../mlir/Dialect/OpenMP/ExternalModels.h | 37 +++++++++++
.../mlir/Dialect/OpenMP/OpenMPDialect.h | 1 -
.../mlir/Dialect/OpenMP/OpenMPInterfaces.h | 5 +-
mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td | 2 -
mlir/include/mlir/InitAllDialects.h | 2 +
mlir/include/mlir/Target/LLVMIR/Dialect/All.h | 3 +
mlir/lib/Dialect/OpenMP/CMakeLists.txt | 62 ++++++++++++++++++-
.../ExternalModels/BuiltinExternalModels.cpp | 35 +++++++++++
.../ExternalModels/FuncExternalModels.cpp | 31 ++++++++++
.../ExternalModels/GPUExternalModels.cpp | 24 +++++++
.../ExternalModels/LLVMExternalModels.cpp | 42 +++++++++++++
mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp | 43 -------------
mlir/lib/Target/LLVMIR/CMakeLists.txt | 4 ++
15 files changed, 248 insertions(+), 50 deletions(-)
create mode 100644 mlir/include/mlir/Dialect/OpenMP/ExternalModels.h
create mode 100644 mlir/lib/Dialect/OpenMP/ExternalModels/BuiltinExternalModels.cpp
create mode 100644 mlir/lib/Dialect/OpenMP/ExternalModels/FuncExternalModels.cpp
create mode 100644 mlir/lib/Dialect/OpenMP/ExternalModels/GPUExternalModels.cpp
create mode 100644 mlir/lib/Dialect/OpenMP/ExternalModels/LLVMExternalModels.cpp
diff --git a/flang/include/flang/Optimizer/Support/InitFIR.h b/flang/include/flang/Optimizer/Support/InitFIR.h
index 8c47ad3d9f4451..76dbf39a1b6e27 100644
--- a/flang/include/flang/Optimizer/Support/InitFIR.h
+++ b/flang/include/flang/Optimizer/Support/InitFIR.h
@@ -19,6 +19,7 @@
#include "mlir/Dialect/Affine/Passes.h"
#include "mlir/Dialect/Complex/IR/Complex.h"
#include "mlir/Dialect/Func/Extensions/InlinerExtension.h"
+#include "mlir/Dialect/OpenMP/ExternalModels.h"
#include "mlir/InitAllDialects.h"
#include "mlir/Pass/Pass.h"
#include "mlir/Pass/PassRegistry.h"
@@ -44,6 +45,9 @@ namespace fir::support {
inline void registerNonCodegenDialects(mlir::DialectRegistry ®istry) {
registry.insert<FLANG_NONCODEGEN_DIALECT_LIST>();
mlir::func::registerInlinerExtension(registry);
+ mlir::omp::registerBuiltinExternalModels(registry);
+ mlir::omp::registerFuncExternalModels(registry);
+ mlir::omp::registerLLVMExternalModels(registry);
}
/// Register all the dialects used by flang.
diff --git a/flang/lib/Optimizer/Transforms/CMakeLists.txt b/flang/lib/Optimizer/Transforms/CMakeLists.txt
index fc067ad3585395..612a20453a9377 100644
--- a/flang/lib/Optimizer/Transforms/CMakeLists.txt
+++ b/flang/lib/Optimizer/Transforms/CMakeLists.txt
@@ -43,4 +43,7 @@ add_flang_library(FIRTransforms
MLIROpenACCDialect
MLIROpenACCToLLVMIRTranslation
MLIROpenMPDialect
+ MLIROpenMPBuiltinExternalModels
+ MLIROpenMPFuncExternalModels
+ MLIROpenMPLLVMExternalModels
)
diff --git a/mlir/include/mlir/Dialect/OpenMP/ExternalModels.h b/mlir/include/mlir/Dialect/OpenMP/ExternalModels.h
new file mode 100644
index 00000000000000..9c3194982eb86f
--- /dev/null
+++ b/mlir/include/mlir/Dialect/OpenMP/ExternalModels.h
@@ -0,0 +1,37 @@
+//===- ExternalModels.h - External models owned by the OMP 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
+//
+//===----------------------------------------------------------------------===//
+//
+// This file declares the OpenMP external models for other dialects.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef MLIR_DIALECT_OPENMP_EXTERNALMODELS_H
+#define MLIR_DIALECT_OPENMP_EXTERNALMODELS_H
+
+namespace mlir {
+class DialectRegistry;
+namespace omp {
+/// Register OMP external models for the Builtin dialect.
+void registerBuiltinExternalModels(DialectRegistry ®istry);
+/// Register OMP external models for the Func dialect.
+void registerFuncExternalModels(DialectRegistry ®istry);
+/// Register OMP external models for the GPU dialect.
+void registerGPUExternalModels(DialectRegistry ®istry);
+/// Register OMP external models for the LLVM dialect.
+void registerLLVMExternalModels(DialectRegistry ®istry);
+/// Register all OMP external models.
+inline void registerAllExternalModels(DialectRegistry ®istry) {
+ registerBuiltinExternalModels(registry);
+ registerFuncExternalModels(registry);
+ registerGPUExternalModels(registry);
+ registerLLVMExternalModels(registry);
+}
+} // namespace omp
+} // namespace mlir
+
+#endif // MLIR_DIALECT_OPENMP_EXTERNALMODELS_H
diff --git a/mlir/include/mlir/Dialect/OpenMP/OpenMPDialect.h b/mlir/include/mlir/Dialect/OpenMP/OpenMPDialect.h
index 23509c5b607016..e6786dfaf2b57f 100644
--- a/mlir/include/mlir/Dialect/OpenMP/OpenMPDialect.h
+++ b/mlir/include/mlir/Dialect/OpenMP/OpenMPDialect.h
@@ -13,7 +13,6 @@
#ifndef MLIR_DIALECT_OPENMP_OPENMPDIALECT_H_
#define MLIR_DIALECT_OPENMP_OPENMPDIALECT_H_
-#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
#include "mlir/Dialect/OpenACCMPCommon/Interfaces/AtomicInterfaces.h"
#include "mlir/IR/Dialect.h"
#include "mlir/IR/OpDefinition.h"
diff --git a/mlir/include/mlir/Dialect/OpenMP/OpenMPInterfaces.h b/mlir/include/mlir/Dialect/OpenMP/OpenMPInterfaces.h
index d78c541252a98d..9b3e23f01ca868 100644
--- a/mlir/include/mlir/Dialect/OpenMP/OpenMPInterfaces.h
+++ b/mlir/include/mlir/Dialect/OpenMP/OpenMPInterfaces.h
@@ -27,9 +27,10 @@ namespace mlir::omp {
// You can override defaults here or implement more complex implementations of
// functions. Or define a completely seperate external model implementation,
// to override the existing implementation.
+template <typename T>
struct OffloadModuleDefaultModel
- : public OffloadModuleInterface::ExternalModel<OffloadModuleDefaultModel,
- mlir::ModuleOp> {};
+ : public OffloadModuleInterface::ExternalModel<OffloadModuleDefaultModel<T>,
+ T> {};
template <typename T>
struct DeclareTargetDefaultModel
diff --git a/mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td b/mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td
index d614f2666a85ab..0703368c141e8a 100644
--- a/mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td
+++ b/mlir/include/mlir/Dialect/OpenMP/OpenMPOps.td
@@ -19,7 +19,6 @@ include "mlir/IR/OpBase.td"
include "mlir/Interfaces/SideEffectInterfaces.td"
include "mlir/Interfaces/ControlFlowInterfaces.td"
include "mlir/IR/SymbolInterfaces.td"
-include "mlir/Dialect/LLVMIR/LLVMOpBase.td"
include "mlir/Dialect/OpenACCMPCommon/Interfaces/AtomicInterfaces.td"
include "mlir/Dialect/OpenMP/OpenMPOpsInterfaces.td"
include "mlir/Dialect/OpenMP/OpenMPTypeInterfaces.td"
@@ -27,7 +26,6 @@ include "mlir/Dialect/OpenMP/OpenMPTypeInterfaces.td"
def OpenMP_Dialect : Dialect {
let name = "omp";
let cppNamespace = "::mlir::omp";
- let dependentDialects = ["::mlir::LLVM::LLVMDialect, ::mlir::func::FuncDialect"];
let useDefaultAttributePrinterParser = 1;
let useDefaultTypePrinterParser = 1;
}
diff --git a/mlir/include/mlir/InitAllDialects.h b/mlir/include/mlir/InitAllDialects.h
index 19a62cadaa2e04..681ab02ed2c20d 100644
--- a/mlir/include/mlir/InitAllDialects.h
+++ b/mlir/include/mlir/InitAllDialects.h
@@ -57,6 +57,7 @@
#include "mlir/Dialect/Mesh/IR/MeshOps.h"
#include "mlir/Dialect/NVGPU/IR/NVGPUDialect.h"
#include "mlir/Dialect/OpenACC/OpenACC.h"
+#include "mlir/Dialect/OpenMP/ExternalModels.h"
#include "mlir/Dialect/OpenMP/OpenMPDialect.h"
#include "mlir/Dialect/PDL/IR/PDL.h"
#include "mlir/Dialect/PDLInterp/IR/PDLInterp.h"
@@ -160,6 +161,7 @@ inline void registerAllDialects(DialectRegistry ®istry) {
memref::registerRuntimeVerifiableOpInterfaceExternalModels(registry);
memref::registerValueBoundsOpInterfaceExternalModels(registry);
memref::registerMemorySlotExternalModels(registry);
+ omp::registerAllExternalModels(registry);
scf::registerBufferDeallocationOpInterfaceExternalModels(registry);
scf::registerBufferizableOpInterfaceExternalModels(registry);
scf::registerValueBoundsOpInterfaceExternalModels(registry);
diff --git a/mlir/include/mlir/Target/LLVMIR/Dialect/All.h b/mlir/include/mlir/Target/LLVMIR/Dialect/All.h
index 0b37e23e45118b..7e76b29bb5977e 100644
--- a/mlir/include/mlir/Target/LLVMIR/Dialect/All.h
+++ b/mlir/include/mlir/Target/LLVMIR/Dialect/All.h
@@ -14,6 +14,7 @@
#ifndef MLIR_TARGET_LLVMIR_DIALECT_ALL_H
#define MLIR_TARGET_LLVMIR_DIALECT_ALL_H
+#include "mlir/Dialect/OpenMP/ExternalModels.h"
#include "mlir/Target/LLVMIR/Dialect/AMX/AMXToLLVMIRTranslation.h"
#include "mlir/Target/LLVMIR/Dialect/ArmNeon/ArmNeonToLLVMIRTranslation.h"
#include "mlir/Target/LLVMIR/Dialect/ArmSME/ArmSMEToLLVMIRTranslation.h"
@@ -52,6 +53,8 @@ static inline void registerAllToLLVMIRTranslations(DialectRegistry ®istry) {
// Extension required for translating GPU offloading Ops.
gpu::registerOffloadingLLVMTranslationInterfaceExternalModels(registry);
+ // Extensions required for translating the OpenMP dialect.
+ omp::registerAllExternalModels(registry);
}
/// Registers all the translations to LLVM IR required by GPU passes.
diff --git a/mlir/lib/Dialect/OpenMP/CMakeLists.txt b/mlir/lib/Dialect/OpenMP/CMakeLists.txt
index 40b4837484a136..a1af7e40dcc6b6 100644
--- a/mlir/lib/Dialect/OpenMP/CMakeLists.txt
+++ b/mlir/lib/Dialect/OpenMP/CMakeLists.txt
@@ -11,7 +11,65 @@ add_mlir_dialect_library(MLIROpenMPDialect
LINK_LIBS PUBLIC
MLIRIR
- MLIRLLVMDialect
- MLIRFuncDialect
+ MLIRControlFlowInterfaces
MLIROpenACCMPCommon
)
+
+add_mlir_dialect_library(MLIROpenMPBuiltinExternalModels
+ ExternalModels/BuiltinExternalModels.cpp
+
+ ADDITIONAL_HEADER_DIRS
+ ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/OpenMP
+
+ DEPENDS
+ MLIROpenMPOpsInterfacesIncGen
+ MLIROpenMPTypeInterfacesIncGen
+
+ LINK_LIBS PUBLIC
+ MLIROpenMPDialect
+)
+
+add_mlir_dialect_library(MLIROpenMPFuncExternalModels
+ ExternalModels/FuncExternalModels.cpp
+
+ ADDITIONAL_HEADER_DIRS
+ ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/OpenMP
+
+ DEPENDS
+ MLIROpenMPOpsInterfacesIncGen
+ MLIROpenMPTypeInterfacesIncGen
+
+ LINK_LIBS PUBLIC
+ MLIROpenMPDialect
+ MLIRFuncDialect
+)
+
+add_mlir_dialect_library(MLIROpenMPGPUExternalModels
+ ExternalModels/GPUExternalModels.cpp
+
+ ADDITIONAL_HEADER_DIRS
+ ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/OpenMP
+
+ DEPENDS
+ MLIROpenMPOpsInterfacesIncGen
+ MLIROpenMPTypeInterfacesIncGen
+
+ LINK_LIBS PUBLIC
+ MLIROpenMPDialect
+ MLIRGPUDialect
+)
+
+add_mlir_dialect_library(MLIROpenMPLLVMExternalModels
+ ExternalModels/LLVMExternalModels.cpp
+
+ ADDITIONAL_HEADER_DIRS
+ ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/OpenMP
+
+ DEPENDS
+ MLIROpenMPOpsInterfacesIncGen
+ MLIROpenMPTypeInterfacesIncGen
+
+ LINK_LIBS PUBLIC
+ MLIROpenMPDialect
+ MLIRLLVMDialect
+)
diff --git a/mlir/lib/Dialect/OpenMP/ExternalModels/BuiltinExternalModels.cpp b/mlir/lib/Dialect/OpenMP/ExternalModels/BuiltinExternalModels.cpp
new file mode 100644
index 00000000000000..e44b721ad39304
--- /dev/null
+++ b/mlir/lib/Dialect/OpenMP/ExternalModels/BuiltinExternalModels.cpp
@@ -0,0 +1,35 @@
+//===- BuiltinExternalModels.cpp - Impl of Builtin external models --------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements the OpenMP external models for the Builtin dialect.
+//
+//===----------------------------------------------------------------------===//
+
+#include "mlir/Dialect/OpenMP/ExternalModels.h"
+#include "mlir/Dialect/OpenMP/OpenMPDialect.h"
+#include "mlir/IR/BuiltinDialect.h"
+
+using namespace mlir;
+
+namespace {
+struct MemRefPointerLikeModel
+ : public omp::PointerLikeType::ExternalModel<MemRefPointerLikeModel,
+ MemRefType> {
+ Type getElementType(Type pointer) const {
+ return llvm::cast<MemRefType>(pointer).getElementType();
+ }
+};
+} // namespace
+
+void omp::registerBuiltinExternalModels(DialectRegistry ®istry) {
+ registry.addExtension(+[](MLIRContext *ctx, BuiltinDialect *dialect) {
+ MemRefType::attachInterface<MemRefPointerLikeModel>(*ctx);
+ mlir::ModuleOp::attachInterface<
+ mlir::omp::OffloadModuleDefaultModel<mlir::ModuleOp>>(*ctx);
+ });
+}
diff --git a/mlir/lib/Dialect/OpenMP/ExternalModels/FuncExternalModels.cpp b/mlir/lib/Dialect/OpenMP/ExternalModels/FuncExternalModels.cpp
new file mode 100644
index 00000000000000..761a304b54778e
--- /dev/null
+++ b/mlir/lib/Dialect/OpenMP/ExternalModels/FuncExternalModels.cpp
@@ -0,0 +1,31 @@
+//===- FuncExternalModels.cpp - Implementation of Func external models ----===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements the OpenMP external models for the Func dialect.
+//
+//===----------------------------------------------------------------------===//
+
+#include "mlir/Dialect/Func/IR/FuncOps.h"
+#include "mlir/Dialect/OpenMP/ExternalModels.h"
+#include "mlir/Dialect/OpenMP/OpenMPDialect.h"
+
+using namespace mlir;
+
+void omp::registerFuncExternalModels(DialectRegistry ®istry) {
+ registry.addExtension(+[](MLIRContext *ctx, func::FuncDialect *dialect) {
+ // Attach default declare target interfaces to operations which can be
+ // marked as declare target (Global Operations and Functions/Subroutines in
+ // dialects that Fortran (or other languages that lower to MLIR) translates
+ // too
+ mlir::func::FuncOp::attachInterface<
+ mlir::omp::DeclareTargetDefaultModel<mlir::func::FuncOp>>(*ctx);
+ // Attach default early outlining interface to func ops.
+ mlir::func::FuncOp::attachInterface<
+ mlir::omp::EarlyOutliningDefaultModel<mlir::func::FuncOp>>(*ctx);
+ });
+}
diff --git a/mlir/lib/Dialect/OpenMP/ExternalModels/GPUExternalModels.cpp b/mlir/lib/Dialect/OpenMP/ExternalModels/GPUExternalModels.cpp
new file mode 100644
index 00000000000000..962aeafefc13d4
--- /dev/null
+++ b/mlir/lib/Dialect/OpenMP/ExternalModels/GPUExternalModels.cpp
@@ -0,0 +1,24 @@
+//===- GPUExternalModels.cpp - Implementation of GPU external models ------===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements the OpenMP external models for the GPU dialect.
+//
+//===----------------------------------------------------------------------===//
+
+#include "mlir/Dialect/GPU/IR/GPUDialect.h"
+#include "mlir/Dialect/OpenMP/ExternalModels.h"
+#include "mlir/Dialect/OpenMP/OpenMPDialect.h"
+
+using namespace mlir;
+
+void omp::registerGPUExternalModels(DialectRegistry ®istry) {
+ registry.addExtension(+[](MLIRContext *ctx, gpu::GPUDialect *dialect) {
+ gpu::GPUModuleOp::attachInterface<
+ omp::OffloadModuleDefaultModel<gpu::GPUModuleOp>>(*ctx);
+ });
+}
diff --git a/mlir/lib/Dialect/OpenMP/ExternalModels/LLVMExternalModels.cpp b/mlir/lib/Dialect/OpenMP/ExternalModels/LLVMExternalModels.cpp
new file mode 100644
index 00000000000000..9c2cc5caa3e692
--- /dev/null
+++ b/mlir/lib/Dialect/OpenMP/ExternalModels/LLVMExternalModels.cpp
@@ -0,0 +1,42 @@
+//===- LLVMExternalModels.cpp - Implementation of LLVM external models ----===//
+//
+// 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
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements the OpenMP external models for the LLVM dialect.
+//
+//===----------------------------------------------------------------------===//
+
+#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
+#include "mlir/Dialect/OpenMP/ExternalModels.h"
+#include "mlir/Dialect/OpenMP/OpenMPDialect.h"
+
+using namespace mlir;
+
+namespace {
+struct LLVMPointerPointerLikeModel
+ : public omp::PointerLikeType::ExternalModel<LLVMPointerPointerLikeModel,
+ LLVM::LLVMPointerType> {
+ Type getElementType(Type pointer) const { return Type(); }
+};
+} // namespace
+
+void omp::registerLLVMExternalModels(DialectRegistry ®istry) {
+ registry.addExtension(+[](MLIRContext *ctx, LLVM::LLVMDialect *dialect) {
+ LLVM::LLVMPointerType::attachInterface<LLVMPointerPointerLikeModel>(*ctx);
+ // Attach default declare target interfaces to operations which can be
+ // marked as declare target (Global Operations and Functions/Subroutines in
+ // dialects that Fortran (or other languages that lower to MLIR) translates
+ // too
+ mlir::LLVM::GlobalOp::attachInterface<
+ mlir::omp::DeclareTargetDefaultModel<mlir::LLVM::GlobalOp>>(*ctx);
+ mlir::LLVM::LLVMFuncOp::attachInterface<
+ mlir::omp::DeclareTargetDefaultModel<mlir::LLVM::LLVMFuncOp>>(*ctx);
+ // Attach default early outlining interface to func ops.
+ mlir::LLVM::LLVMFuncOp::attachInterface<
+ mlir::omp::EarlyOutliningDefaultModel<mlir::LLVM::LLVMFuncOp>>(*ctx);
+ });
+}
diff --git a/mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp b/mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp
index 6e69cd0d386bd2..b1877636f4c57f 100644
--- a/mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp
+++ b/mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp
@@ -11,8 +11,6 @@
//===----------------------------------------------------------------------===//
#include "mlir/Dialect/OpenMP/OpenMPDialect.h"
-#include "mlir/Dialect/Func/IR/FuncOps.h"
-#include "mlir/Dialect/LLVMIR/LLVMTypes.h"
#include "mlir/Dialect/OpenACCMPCommon/Interfaces/AtomicInterfaces.h"
#include "mlir/IR/Attributes.h"
#include "mlir/IR/DialectImplementation.h"
@@ -39,20 +37,6 @@ using namespace mlir;
using namespace mlir::omp;
namespace {
-struct MemRefPointerLikeModel
- : public PointerLikeType::ExternalModel<MemRefPointerLikeModel,
- MemRefType> {
- Type getElementType(Type pointer) const {
- return llvm::cast<MemRefType>(pointer).getElementType();
- }
-};
-
-struct LLVMPointerPointerLikeModel
- : public PointerLikeType::ExternalModel<LLVMPointerPointerLikeModel,
- LLVM::LLVMPointerType> {
- Type getElementType(Type pointer) const { return Type(); }
-};
-
struct OpenMPDialectFoldInterface : public DialectFoldInterface {
using DialectFoldInterface::DialectFoldInterface;
@@ -78,33 +62,6 @@ void OpenMPDialect::initialize() {
>();
addInterface<OpenMPDialectFoldInterface>();
- MemRefType::attachInterface<MemRefPointerLikeModel>(*getContext());
- LLVM::LLVMPointerType::attachInterface<LLVMPointerPointerLikeModel>(
- *getContext());
-
- // Attach default offload module interface to module op to access
- // offload functionality through
- mlir::ModuleOp::attachInterface<mlir::omp::OffloadModuleDefaultModel>(
- *getContext());
-
- // Attach default declare target interfaces to operations which can be marked
- // as declare target (Global Operations and Functions/Subroutines in dialects
- // that Fortran (or other languages that lower to MLIR) translates too
- mlir::LLVM::GlobalOp::attachInterface<
- mlir::omp::DeclareTargetDefaultModel<mlir::LLVM::GlobalOp>>(
- *getContext());
- mlir::LLVM::LLVMFuncOp::attachInterface<
- mlir::omp::DeclareTargetDefaultModel<mlir::LLVM::LLVMFuncOp>>(
- *getContext());
- mlir::func::FuncOp::attachInterface<
- mlir::omp::DeclareTargetDefaultModel<mlir::func::FuncOp>>(*getContext());
-
- // Attach default early outlining interface to func ops.
- mlir::func::FuncOp::attachInterface<
- mlir::omp::EarlyOutliningDefaultModel<mlir::func::FuncOp>>(*getContext());
- mlir::LLVM::LLVMFuncOp::attachInterface<
- mlir::omp::EarlyOutliningDefaultModel<mlir::LLVM::LLVMFuncOp>>(
- *getContext());
}
//===----------------------------------------------------------------------===//
diff --git a/mlir/lib/Target/LLVMIR/CMakeLists.txt b/mlir/lib/Target/LLVMIR/CMakeLists.txt
index 94280a2ec9012b..072a597eb52e72 100644
--- a/mlir/lib/Target/LLVMIR/CMakeLists.txt
+++ b/mlir/lib/Target/LLVMIR/CMakeLists.txt
@@ -57,6 +57,10 @@ add_mlir_translation_library(MLIRToLLVMIRTranslationRegistration
MLIRNVVMToLLVMIRTranslation
MLIROpenACCToLLVMIRTranslation
MLIROpenMPToLLVMIRTranslation
+ MLIROpenMPBuiltinExternalModels
+ MLIROpenMPFuncExternalModels
+ MLIROpenMPGPUExternalModels
+ MLIROpenMPLLVMExternalModels
MLIRROCDLToLLVMIRTranslation
MLIRSPIRVToLLVMIRTranslation
)
More information about the flang-commits
mailing list