shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

NFC: Cleanup the naming scheme for registering legalization actions to be consistent, and move a file functions to the source file.

Browse Source 
PiperOrigin-RevId: 252639629
This commit is contained in:
River Riddle 2019-06-11 09:51:05 -07:00 committed by Mehdi Amini
parent 8ad35b90ec
commit eb28b30940
9 changed files with 68 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mlir/examples/Linalg/Linalg1/lib/ConvertToLLVMDialect.cpp
View File

@ -422,7 +422,7 @@ void linalg::convertToLLVM(mlir::Module &module) {
populateLinalg1ToLLVMConversionPatterns(patterns, module.getContext());
ConversionTarget target(*module.getContext());
target.addLegalDialects<LLVM::LLVMDialect>();
target.addLegalDialect<LLVM::LLVMDialect>();
auto r =
applyConversionPatterns(module, target, converter, std::move(patterns));
(void)r;

2
mlir/examples/Linalg/Linalg3/lib/ConvertToLLVMDialect.cpp
View File

@ -163,7 +163,7 @@ void linalg::convertLinalg3ToLLVM(Module &module) {
populateLinalg3ToLLVMConversionPatterns(patterns, module.getContext());
ConversionTarget target(*module.getContext());
target.addLegalDialects<LLVM::LLVMDialect>();
target.addLegalDialect<LLVM::LLVMDialect>();
auto r =
applyConversionPatterns(module, target, converter, std::move(patterns));
(void)r;

2
mlir/examples/toy/Ch5/mlir/EarlyLowering.cpp
View File

@ -127,7 +127,7 @@ public:
struct EarlyLoweringPass : public FunctionPass<EarlyLoweringPass> {
void runOnFunction() override {
ConversionTarget target(getContext());
target.addLegalDialects<linalg::LinalgDialect, StandardOpsDialect>();
target.addLegalDialect<linalg::LinalgDialect, StandardOpsDialect>();
target.addLegalOp<toy::AllocOp, toy::TypeCastOp>();
OwningRewritePatternList patterns;

4
mlir/examples/toy/Ch5/mlir/LateLowering.cpp
View File

@ -345,8 +345,8 @@ struct LateLoweringPass : public ModulePass<LateLoweringPass> {
// Perform Toy specific lowering.
ConversionTarget target(getContext());
target.addLegalDialects<AffineOpsDialect, linalg::LinalgDialect,
LLVM::LLVMDialect, StandardOpsDialect>();
target.addLegalDialect<AffineOpsDialect, linalg::LinalgDialect,
LLVM::LLVMDialect, StandardOpsDialect>();
target.addLegalOp<toy::AllocOp, toy::TypeCastOp>();
if (failed(applyConversionPatterns(getModule(), target, typeConverter,
std::move(toyPatterns)))) {

58
mlir/include/mlir/Transforms/DialectConversion.h
View File

@ -180,9 +180,7 @@ public:
//===--------------------------------------------------------------------===//
/// Register a legality action for the given operation.
void setOpAction(OperationName op, LegalizationAction action) {
legalOperations[op] = action;
}
void setOpAction(OperationName op, LegalizationAction action);
template <typename OpT> void setOpAction(LegalizationAction action) {
setOpAction(OperationName(OpT::getOperationName(), &ctx), action);
}
@ -196,21 +194,6 @@ public:
addLegalOp<OpT2, OpTs...>();
}
/// Register the operations of the given dialects as legal.
void addLegalDialects(ArrayRef<StringRef> dialectNames) {
for (auto &dialect : dialectNames)
legalDialects[dialect] = LegalizationAction::Legal;
}
template <typename... Names>
void addLegalDialects(StringRef name, Names... names) {
SmallVector<StringRef, 2> dialectNames({name, names...});
addLegalDialects(dialectNames);
}
template <typename... Args> void addLegalDialects() {
SmallVector<StringRef, 2> dialectNames({Args::getDialectNamespace()...});
addLegalDialects(dialectNames);
}
/// Register the given operation as dynamically legal, i.e. requiring custom
/// handling by the target via 'isLegal'.
template <typename OpT> void addDynamicallyLegalOp() {
@ -222,22 +205,39 @@ public:
addDynamicallyLegalOp<OpT2, OpTs...>();
}
/// Register a legality action for the given dialects.
void setDialectAction(ArrayRef<StringRef> dialectNames,
LegalizationAction action);
/// Register the operations of the given dialects as legal.
template <typename... Names>
void addLegalDialect(StringRef name, Names... names) {
SmallVector<StringRef, 2> dialectNames({name, names...});
setDialectAction(dialectNames, LegalizationAction::Legal);
}
template <typename... Args> void addLegalDialect() {
SmallVector<StringRef, 2> dialectNames({Args::getDialectNamespace()...});
setDialectAction(dialectNames, LegalizationAction::Legal);
}
/// Register the operations of the given dialects as dynamically legal, i.e.
/// requiring custom handling by the target via 'isLegal'.
template <typename... Names>
void addDynamicallyLegalDialect(StringRef name, Names... names) {
SmallVector<StringRef, 2> dialectNames({name, names...});
setDialectAction(dialectNames, LegalizationAction::Dynamic);
}
template <typename... Args> void addDynamicallyLegalDialect() {
SmallVector<StringRef, 2> dialectNames({Args::getDialectNamespace()...});
setDialectAction(dialectNames, LegalizationAction::Dynamic);
}
//===--------------------------------------------------------------------===//
// Legality Querying
//===--------------------------------------------------------------------===//
/// Get the legality action for the given operation.
llvm::Optional<LegalizationAction> getOpAction(OperationName op) const {
// Check for an action for this specific operation.
auto it = legalOperations.find(op);
if (it != legalOperations.end())
return it->second;
// Otherwise, default to checking for an action on the parent dialect.
auto dialectIt = legalDialects.find(op.getDialect());
if (dialectIt != legalDialects.end())
return dialectIt->second;
return llvm::None;
}
llvm::Optional<LegalizationAction> getOpAction(OperationName op) const;
private:
/// A deterministic mapping of operation name to the specific legality action

2
mlir/lib/LLVMIR/Transforms/ConvertToLLVMDialect.cpp
View File

@ -994,7 +994,7 @@ struct LLVMLoweringPass : public ModulePass<LLVMLoweringPass> {
populateStdToLLVMConversionPatterns(converter, patterns);
ConversionTarget target(getContext());
target.addLegalDialects<LLVM::LLVMDialect>();
target.addLegalDialect<LLVM::LLVMDialect>();
if (failed(
applyConversionPatterns(m, target, converter, std::move(patterns))))
signalPassFailure();

2
mlir/lib/Linalg/Transforms/LowerToLLVMDialect.cpp
View File

@ -689,7 +689,7 @@ void LowerLinalgToLLVMPass::runOnModule() {
populateLinalgToLLVMConversionPatterns(converter, patterns, &getContext());
ConversionTarget target(getContext());
target.addLegalDialects<LLVM::LLVMDialect>();
target.addLegalDialect<LLVM::LLVMDialect>();
if (failed(applyConversionPatterns(module, target, converter,
std::move(patterns))))
signalPassFailure();

31
mlir/lib/Transforms/DialectConversion.cpp
View File

@ -724,6 +724,37 @@ FunctionType TypeConverter::convertFunctionSignatureType(
return FunctionType::get(arguments, results, type.getContext());
}
//===----------------------------------------------------------------------===//
// ConversionTarget
//===----------------------------------------------------------------------===//
/// Register a legality action for the given operation.
void ConversionTarget::setOpAction(OperationName op,
LegalizationAction action) {
legalOperations[op] = action;
}
/// Register a legality action for the given dialects.
void ConversionTarget::setDialectAction(ArrayRef<StringRef> dialectNames,
LegalizationAction action) {
for (StringRef dialect : dialectNames)
legalDialects[dialect] = action;
}
/// Get the legality action for the given operation.
auto ConversionTarget::getOpAction(OperationName op) const
-> llvm::Optional<LegalizationAction> {
// Check for an action for this specific operation.
auto it = legalOperations.find(op);
if (it != legalOperations.end())
return it->second;
// Otherwise, default to checking for an action on the parent dialect.
auto dialectIt = legalDialects.find(op.getDialect());
if (dialectIt != legalDialects.end())
return dialectIt->second;
return llvm::None;
}
//===----------------------------------------------------------------------===//
// applyConversionPatterns
//===----------------------------------------------------------------------===//

2
mlir/lib/Transforms/LowerAffine.cpp
View File

@ -597,7 +597,7 @@ LogicalResult mlir::lowerAffineConstructs(Function &function) {
AffineTerminatorLowering>::build(patterns,
function.getContext());
ConversionTarget target(*function.getContext());
target.addLegalDialects<StandardOpsDialect>();
target.addLegalDialect<StandardOpsDialect>();
return applyConversionPatterns(function, target, std::move(patterns));
}