Skip to content

Commit 7498eaa

Browse files
fabianmcgfabianmcg
authored
[mlir][LLVM] Add the ConvertToLLVMAttrInterface and ConvertToLLVMOpInterface interfaces (#99566)
This patch adds the `ConvertToLLVMAttrInterface` and `ConvertToLLVMOpInterface` interfaces. It also modifies the `convert-to-llvm` pass to use these interfaces when available. The `ConvertToLLVMAttrInterface` interfaces allows attributes to configure conversion to LLVM, including the conversion target, LLVM type converter, and populating conversion patterns. See the `NVVMTargetAttr` implementation of this interface for an example of how this interface can be used to configure conversion to LLVM. The `ConvertToLLVMOpInterface` interface collects all convert to LLVM attributes stored in an operation. Finally, the `convert-to-llvm` pass was modified to use these interfaces when available. This allows applying `convert-to-llvm` to GPU modules and letting the `NVVMTargetAttr` decide which patterns to populate.
1 parent 0c21ed4 commit 7498eaa

File tree

15 files changed

+519
-70
lines changed

15 files changed

+519
-70
lines changed

‎mlir/include/mlir/Conversion/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ mlir_tablegen(Passes.capi.cpp.inc -gen-pass-capi-impl --prefix Conversion)
66
add_public_tablegen_target(MLIRConversionPassIncGen)
77

88
add_mlir_doc(Passes ConversionPasses ./ -gen-pass-doc)
9+
10+
add_subdirectory(ConvertToLLVM)

‎mlir/include/mlir/Conversion/ConvertToLLVM/CMakeLists.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
set(LLVM_TARGET_DEFINITIONS ToLLVMInterface.td)
2+
mlir_tablegen(ToLLVMAttrInterface.h.inc -gen-attr-interface-decls)
3+
mlir_tablegen(ToLLVMAttrInterface.cpp.inc -gen-attr-interface-defs)
4+
mlir_tablegen(ToLLVMOpInterface.h.inc -gen-op-interface-decls)
5+
mlir_tablegen(ToLLVMOpInterface.cpp.inc -gen-op-interface-defs)
6+
add_public_tablegen_target(MLIRConvertToLLVMInterfaceIncGen)
7+
add_dependencies(mlir-generic-headers MLIRConvertToLLVMInterfaceIncGen)

‎mlir/include/mlir/Conversion/ConvertToLLVM/ToLLVMInterface.h‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@
1111

1212
#include "mlir/IR/DialectInterface.h"
1313
#include "mlir/IR/MLIRContext.h"
14+
#include "mlir/IR/OpDefinition.h"
1415

1516
namespace mlir {
1617
class ConversionTarget;
1718
class LLVMTypeConverter;
1819
class MLIRContext;
1920
class Operation;
2021
class RewritePatternSet;
22+
class AnalysisManager;
2123

2224
/// Base class for dialect interfaces providing translation to LLVM IR.
2325
/// Dialects that can be translated should provide an implementation of this
@@ -50,6 +52,18 @@ void populateConversionTargetFromOperation(Operation *op,
5052
LLVMTypeConverter &typeConverter,
5153
RewritePatternSet &patterns);
5254

55+
/// Helper function for populating LLVM conversion patterns. If `op` implements
56+
/// the `ConvertToLLVMOpInterface` interface, then the LLVM conversion pattern
57+
/// attributes provided by the interface will be used to configure the
58+
/// conversion target, type converter, and the pattern set.
59+
void populateOpConvertToLLVMConversionPatterns(Operation *op,
60+
ConversionTarget &target,
61+
LLVMTypeConverter &typeConverter,
62+
RewritePatternSet &patterns);
5363
} // namespace mlir
5464

65+
#include "mlir/Conversion/ConvertToLLVM/ToLLVMAttrInterface.h.inc"
66+
67+
#include "mlir/Conversion/ConvertToLLVM/ToLLVMOpInterface.h.inc"
68+
5569
#endif // MLIR_CONVERSION_CONVERTTOLLVM_TOLLVMINTERFACE_H

‎mlir/include/mlir/Conversion/ConvertToLLVM/ToLLVMInterface.td‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
2+
//===- ToLLVMInterface.td - Conversion to LLVM interfaces -----*- tablegen -*-===//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
//
9+
// Defines interfaces for managing transformations, including populating
10+
// pattern rewrites.
11+
//
12+
//===----------------------------------------------------------------------===//
13+
14+
#ifndef MLIR_CONVERSION_CONVERTTOLLVM_TOLLVMINTERFACE_TD
15+
#define MLIR_CONVERSION_CONVERTTOLLVM_TOLLVMINTERFACE_TD
16+
17+
include "mlir/IR/OpBase.td"
18+
19+
//===----------------------------------------------------------------------===//
20+
// Attribute interface
21+
//===----------------------------------------------------------------------===//
22+
23+
def ConvertToLLVMAttrInterface :
24+
AttrInterface<"ConvertToLLVMAttrInterface"> {
25+
let description = [{
26+
The `ConvertToLLVMAttrInterface` attribute interfaces allows using
27+
attributes to configure the convert to LLVM infrastructure, this includes:
28+
- The conversion target.
29+
- The LLVM type converter.
30+
- The pattern set.
31+
32+
This interface permits fined grained configuration of the `convert-to-llvm`
33+
process. For example, attributes with target information like
34+
`#nvvm.target` or `#rodcl.target` can leverage this interface for populating
35+
patterns specific to a particular target.
36+
}];
37+
let cppNamespace = "::mlir";
38+
let methods = [
39+
InterfaceMethod<
40+
/*desc=*/[{
41+
Populate the dialect conversion target, type converter and pattern set.
42+
}],
43+
/*retTy=*/"void",
44+
/*methodName=*/"populateConvertToLLVMConversionPatterns",
45+
/*args=*/(ins "::mlir::ConversionTarget&":$target,
46+
"::mlir::LLVMTypeConverter&":$typeConverter,
47+
"::mlir::RewritePatternSet&":$patternSet)>
48+
];
49+
}
50+
51+
//===----------------------------------------------------------------------===//
52+
// Op interface
53+
//===----------------------------------------------------------------------===//
54+
55+
def ConvertToLLVMOpInterface : OpInterface<"ConvertToLLVMOpInterface"> {
56+
let description = [{
57+
Interface for collecting all convert to LLVM attributes stored in an
58+
operation. See `ConvertToLLVMAttrInterface` for more information on these
59+
attributes.
60+
}];
61+
let cppNamespace = "::mlir";
62+
let methods = [
63+
InterfaceMethod<
64+
/*desc=*/[{
65+
Populate the provided vector with a list of convert to LLVM attributes
66+
to apply.
67+
}],
68+
/*retTy=*/"void",
69+
/*methodName=*/"getConvertToLLVMConversionAttrs",
70+
/*args=*/(ins
71+
"::llvm::SmallVectorImpl<::mlir::ConvertToLLVMAttrInterface>&":$attrs)
72+
>
73+
];
74+
}
75+
76+
#endif // MLIR_CONVERSION_CONVERTTOLLVM_TOLLVMINTERFACE_TD

‎mlir/include/mlir/Conversion/GPUCommon/GPUToLLVM.h‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
//===- GPUToLLVM.h - Convert GPU to LLVM dialect ----------------*- C++ -*-===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
//
9+
// This files declares registration functions for converting GPU to LLVM.
10+
//
11+
//===----------------------------------------------------------------------===//
12+
13+
#ifndef MLIR_CONVERSION_GPUCOMMON_GPUTOLLVM_H
14+
#define MLIR_CONVERSION_GPUCOMMON_GPUTOLLVM_H
15+
16+
namespace mlir {
17+
class DialectRegistry;
18+
namespace gpu {
19+
/// Registers the `ConvertToLLVMOpInterface` interface on the `gpu::GPUModuleOP`
20+
/// operation.
21+
void registerConvertGpuToLLVMInterface(DialectRegistry &registry);
22+
} // namespace gpu
23+
} // namespace mlir
24+
25+
#endif // MLIR_CONVERSION_GPUCOMMON_GPUTOLLVM_H

‎mlir/include/mlir/Conversion/GPUToNVVM/GPUToNVVM.h‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
//===- GPUToNVVM.h - Convert GPU to NVVM dialect ----------------*- C++ -*-===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
//
9+
// This files declares registration functions for converting GPU to NVVM.
10+
//
11+
//===----------------------------------------------------------------------===//
12+
13+
#ifndef MLIR_CONVERSION_GPUTONVVM_GPUTONVVM_H
14+
#define MLIR_CONVERSION_GPUTONVVM_GPUTONVVM_H
15+
16+
namespace mlir {
17+
class DialectRegistry;
18+
namespace NVVM {
19+
/// Registers the `ConvertToLLVMAttrInterface` interface on the
20+
/// `NVVM::NVVMTargetAttr` attribute. This interface populates the conversion
21+
/// target, LLVM type converter, and pattern set for converting GPU operations
22+
/// to NVVM.
23+
void registerConvertGpuToNVVMInterface(DialectRegistry &registry);
24+
} // namespace NVVM
25+
} // namespace mlir
26+
27+
#endif // MLIR_CONVERSION_GPUTONVVM_GPUTONVVM_H

‎mlir/include/mlir/Conversion/GPUToNVVM/GPUToNVVMPass.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ LLVM::LLVMStructType convertMMAToLLVMType(gpu::MMAMatrixType type);
3131
/// Configure target to convert from the GPU dialect to NVVM.
3232
void configureGpuToNVVMConversionLegality(ConversionTarget &target);
3333

34+
/// Configure the LLVM type convert to convert types and address spaces from the
35+
/// GPU dialect to NVVM.
36+
void configureGpuToNVVMTypeConverter(LLVMTypeConverter &converter);
37+
3438
/// Collect a set of patterns to convert from the GPU dialect to NVVM.
3539
void populateGpuToNVVMConversionPatterns(const LLVMTypeConverter &converter,
3640
RewritePatternSet &patterns);

‎mlir/include/mlir/Conversion/Passes.td‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,20 @@ def ConvertToLLVMPass : Pass<"convert-to-llvm"> {
2222
This is a generic pass to convert to LLVM, it uses the
2323
`ConvertToLLVMPatternInterface` dialect interface to delegate to dialects
2424
the injection of conversion patterns.
25+
26+
If `dynamic` is set to `true`, the pass will look for
27+
`ConvertToLLVMAttrInterface` attributes and use them to further configure
28+
the conversion process. This option also uses the `DataLayoutAnalysis`
29+
analysis to configure the type converter. Enabling this option incurs in
30+
extra overhead.
2531
}];
2632

2733
let constructor = "mlir::createConvertToLLVMPass()";
2834
let options = [
2935
ListOption<"filterDialects", "filter-dialects", "std::string",
3036
"Test conversion patterns of only the specified dialects">,
37+
Option<"useDynamic", "dynamic", "bool", "false",
38+
"Use op conversion attributes to configure the conversion">,
3139
];
3240
}
3341

‎mlir/include/mlir/InitAllExtensions.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
#include "mlir/Conversion/ComplexToLLVM/ComplexToLLVM.h"
1919
#include "mlir/Conversion/ControlFlowToLLVM/ControlFlowToLLVM.h"
2020
#include "mlir/Conversion/FuncToLLVM/ConvertFuncToLLVM.h"
21+
#include "mlir/Conversion/GPUCommon/GPUToLLVM.h"
22+
#include "mlir/Conversion/GPUToNVVM/GPUToNVVM.h"
2123
#include "mlir/Conversion/IndexToLLVM/IndexToLLVM.h"
2224
#include "mlir/Conversion/MathToLLVM/MathToLLVM.h"
2325
#include "mlir/Conversion/MemRefToLLVM/MemRefToLLVM.h"
@@ -72,6 +74,8 @@ inline void registerAllExtensions(DialectRegistry &registry) {
7274
registerConvertOpenMPToLLVMInterface(registry);
7375
ub::registerConvertUBToLLVMInterface(registry);
7476
registerConvertAMXToLLVMInterface(registry);
77+
gpu::registerConvertGpuToLLVMInterface(registry);
78+
NVVM::registerConvertGpuToNVVMInterface(registry);
7579

7680
// Register all transform dialect extensions.
7781
affine::registerTransformDialectExtension(registry);

‎mlir/lib/Conversion/ConvertToLLVM/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ add_mlir_conversion_library(MLIRConvertToLLVMInterface
77
ToLLVMInterface.cpp
88

99
DEPENDS
10+
MLIRConvertToLLVMInterfaceIncGen
1011

1112
LINK_LIBS PUBLIC
1213
MLIRIR
@@ -21,6 +22,7 @@ add_mlir_conversion_library(MLIRConvertToLLVMPass
2122

2223
LINK_LIBS PUBLIC
2324
MLIRIR
25+
MLIRConvertToLLVMInterface
2426
MLIRLLVMCommonConversion
2527
MLIRLLVMDialect
2628
MLIRPass

0 commit comments

Comments
 (0)