[Mlir-commits] [mlir] b7f93c2 - [mlir] (NFC) run clang-format on all files
Jeff Niu
llvmlistbot at llvm.org
Thu Jul 14 13:32:24 PDT 2022
Author: Jeff Niu
Date: 2022-07-14T13:32:13-07:00
New Revision: b7f93c28096fc8503e4d2d80c43ee2c0ccce480f
URL: https://github.com/llvm/llvm-project/commit/b7f93c28096fc8503e4d2d80c43ee2c0ccce480f
DIFF: https://github.com/llvm/llvm-project/commit/b7f93c28096fc8503e4d2d80c43ee2c0ccce480f.diff
LOG: [mlir] (NFC) run clang-format on all files
Added:
Modified:
mlir/examples/toy/Ch1/parser/AST.cpp
mlir/examples/toy/Ch2/parser/AST.cpp
mlir/examples/toy/Ch3/parser/AST.cpp
mlir/examples/toy/Ch4/parser/AST.cpp
mlir/examples/toy/Ch5/mlir/LowerToAffineLoops.cpp
mlir/examples/toy/Ch5/parser/AST.cpp
mlir/examples/toy/Ch6/mlir/LowerToAffineLoops.cpp
mlir/examples/toy/Ch6/parser/AST.cpp
mlir/examples/toy/Ch7/mlir/LowerToAffineLoops.cpp
mlir/examples/toy/Ch7/parser/AST.cpp
mlir/include/mlir/Analysis/AliasAnalysis.h
mlir/include/mlir/Analysis/CallGraph.h
mlir/include/mlir/Bindings/Python/PybindAdaptors.h
mlir/include/mlir/Conversion/GPUToVulkan/ConvertGPUToVulkanPass.h
mlir/include/mlir/Dialect/Bufferization/IR/BufferizableOpInterface.h
mlir/include/mlir/ExecutionEngine/ExecutionEngine.h
mlir/include/mlir/ExecutionEngine/SparseTensorUtils.h
mlir/include/mlir/IR/AffineExprVisitor.h
mlir/include/mlir/IR/Attributes.h
mlir/include/mlir/IR/BlockAndValueMapping.h
mlir/include/mlir/IR/BlockSupport.h
mlir/include/mlir/IR/BuiltinAttributeInterfaces.h
mlir/include/mlir/IR/BuiltinAttributes.h
mlir/include/mlir/IR/Diagnostics.h
mlir/include/mlir/IR/Dialect.h
mlir/include/mlir/IR/DialectInterface.h
mlir/include/mlir/IR/IntegerSet.h
mlir/include/mlir/IR/Location.h
mlir/include/mlir/IR/OpDefinition.h
mlir/include/mlir/IR/OpImplementation.h
mlir/include/mlir/IR/OperationSupport.h
mlir/include/mlir/IR/PatternMatch.h
mlir/include/mlir/IR/RegionGraphTraits.h
mlir/include/mlir/IR/StorageUniquerSupport.h
mlir/include/mlir/IR/TypeSupport.h
mlir/include/mlir/IR/Types.h
mlir/include/mlir/IR/UseDefLists.h
mlir/include/mlir/Interfaces/SideEffectInterfaces.h
mlir/include/mlir/Pass/AnalysisManager.h
mlir/include/mlir/Pass/Pass.h
mlir/include/mlir/Pass/PassInstrumentation.h
mlir/include/mlir/Pass/PassManager.h
mlir/include/mlir/Pass/PassRegistry.h
mlir/include/mlir/Support/DebugAction.h
mlir/include/mlir/Support/InterfaceSupport.h
mlir/include/mlir/Support/LLVM.h
mlir/include/mlir/Support/LogicalResult.h
mlir/include/mlir/Support/StorageUniquer.h
mlir/include/mlir/Support/TypeID.h
mlir/include/mlir/TableGen/CodeGenHelpers.h
mlir/include/mlir/TableGen/Format.h
mlir/include/mlir/Tools/PDLL/AST/Nodes.h
mlir/include/mlir/Tools/PDLL/AST/Types.h
mlir/include/mlir/Transforms/FoldUtils.h
mlir/include/mlir/Transforms/ViewOpGraph.h
mlir/lib/Conversion/BufferizationToMemRef/BufferizationToMemRef.cpp
mlir/lib/Conversion/ComplexToStandard/ComplexToStandard.cpp
mlir/lib/Conversion/GPUCommon/GPUToLLVMConversion.cpp
mlir/lib/Conversion/LinalgToSPIRV/LinalgToSPIRV.cpp
mlir/lib/Conversion/LinalgToStandard/LinalgToStandard.cpp
mlir/lib/Dialect/Affine/IR/AffineOps.cpp
mlir/lib/Dialect/Arithmetic/IR/ArithmeticOps.cpp
mlir/lib/Dialect/Arithmetic/Transforms/ExpandOps.cpp
mlir/lib/Dialect/Bufferization/Transforms/Bufferize.cpp
mlir/lib/Dialect/GPU/Transforms/SerializeToCubin.cpp
mlir/lib/Dialect/GPU/Transforms/SerializeToHsaco.cpp
mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
mlir/lib/Dialect/LLVMIR/IR/LLVMTypeSyntax.cpp
mlir/lib/Dialect/MemRef/Transforms/ComposeSubView.cpp
mlir/lib/Dialect/SPIRV/IR/SPIRVDialect.cpp
mlir/lib/Dialect/SPIRV/IR/SPIRVTypes.cpp
mlir/lib/IR/AffineExpr.cpp
mlir/lib/IR/AsmPrinter.cpp
mlir/lib/IR/Block.cpp
mlir/lib/IR/Diagnostics.cpp
mlir/lib/IR/FunctionInterfaces.cpp
mlir/lib/IR/OperationSupport.cpp
mlir/lib/IR/Value.cpp
mlir/lib/Parser/AsmParserImpl.h
mlir/lib/Parser/AsmParserState.cpp
mlir/lib/Parser/AttributeParser.cpp
mlir/lib/Pass/IRPrinting.cpp
mlir/lib/Pass/PassRegistry.cpp
mlir/lib/Rewrite/PatternApplicator.cpp
mlir/lib/Target/LLVMIR/Dialect/OpenACC/OpenACCToLLVMIRTranslation.cpp
mlir/lib/Target/SPIRV/Deserialization/Deserializer.h
mlir/lib/Target/SPIRV/Serialization/Serializer.h
mlir/lib/Tools/PDLL/AST/Nodes.cpp
mlir/lib/Tools/PDLL/Parser/Lexer.cpp
mlir/lib/Tools/PDLL/Parser/Lexer.h
mlir/lib/Transforms/ViewOpGraph.cpp
mlir/tools/mlir-tblgen/OpFormatGen.cpp
mlir/unittests/Support/DebugActionTest.cpp
mlir/unittests/TableGen/OpBuildGen.cpp
Removed:
################################################################################
diff --git a/mlir/examples/toy/Ch1/parser/AST.cpp b/mlir/examples/toy/Ch1/parser/AST.cpp
index 7b98b017d82dd..875b2e268ccd0 100644
--- a/mlir/examples/toy/Ch1/parser/AST.cpp
+++ b/mlir/examples/toy/Ch1/parser/AST.cpp
@@ -60,7 +60,8 @@ class ASTDumper {
} // namespace
/// Return a formatted string for the location of any node
-template <typename T> static std::string loc(T *node) {
+template <typename T>
+static std::string loc(T *node) {
const auto &loc = node->loc();
return (llvm::Twine("@") + *loc.file + ":" + llvm::Twine(loc.line) + ":" +
llvm::Twine(loc.col))
diff --git a/mlir/examples/toy/Ch2/parser/AST.cpp b/mlir/examples/toy/Ch2/parser/AST.cpp
index 7b98b017d82dd..875b2e268ccd0 100644
--- a/mlir/examples/toy/Ch2/parser/AST.cpp
+++ b/mlir/examples/toy/Ch2/parser/AST.cpp
@@ -60,7 +60,8 @@ class ASTDumper {
} // namespace
/// Return a formatted string for the location of any node
-template <typename T> static std::string loc(T *node) {
+template <typename T>
+static std::string loc(T *node) {
const auto &loc = node->loc();
return (llvm::Twine("@") + *loc.file + ":" + llvm::Twine(loc.line) + ":" +
llvm::Twine(loc.col))
diff --git a/mlir/examples/toy/Ch3/parser/AST.cpp b/mlir/examples/toy/Ch3/parser/AST.cpp
index 7b98b017d82dd..875b2e268ccd0 100644
--- a/mlir/examples/toy/Ch3/parser/AST.cpp
+++ b/mlir/examples/toy/Ch3/parser/AST.cpp
@@ -60,7 +60,8 @@ class ASTDumper {
} // namespace
/// Return a formatted string for the location of any node
-template <typename T> static std::string loc(T *node) {
+template <typename T>
+static std::string loc(T *node) {
const auto &loc = node->loc();
return (llvm::Twine("@") + *loc.file + ":" + llvm::Twine(loc.line) + ":" +
llvm::Twine(loc.col))
diff --git a/mlir/examples/toy/Ch4/parser/AST.cpp b/mlir/examples/toy/Ch4/parser/AST.cpp
index 7b98b017d82dd..875b2e268ccd0 100644
--- a/mlir/examples/toy/Ch4/parser/AST.cpp
+++ b/mlir/examples/toy/Ch4/parser/AST.cpp
@@ -60,7 +60,8 @@ class ASTDumper {
} // namespace
/// Return a formatted string for the location of any node
-template <typename T> static std::string loc(T *node) {
+template <typename T>
+static std::string loc(T *node) {
const auto &loc = node->loc();
return (llvm::Twine("@") + *loc.file + ":" + llvm::Twine(loc.line) + ":" +
llvm::Twine(loc.col))
diff --git a/mlir/examples/toy/Ch5/mlir/LowerToAffineLoops.cpp b/mlir/examples/toy/Ch5/mlir/LowerToAffineLoops.cpp
index b518a287b6e14..5c8b1bcd21015 100644
--- a/mlir/examples/toy/Ch5/mlir/LowerToAffineLoops.cpp
+++ b/mlir/examples/toy/Ch5/mlir/LowerToAffineLoops.cpp
@@ -104,25 +104,26 @@ struct BinaryOpLowering : public ConversionPattern {
matchAndRewrite(Operation *op, ArrayRef<Value> operands,
ConversionPatternRewriter &rewriter) const final {
auto loc = op->getLoc();
- lowerOpToLoops(
- op, operands, rewriter,
- [loc](OpBuilder &builder, ValueRange memRefOperands,
- ValueRange loopIvs) {
- // Generate an adaptor for the remapped operands of the BinaryOp. This
- // allows for using the nice named accessors that are generated by the
- // ODS.
- typename BinaryOp::Adaptor binaryAdaptor(memRefOperands);
-
- // Generate loads for the element of 'lhs' and 'rhs' at the inner
- // loop.
- auto loadedLhs = builder.create<AffineLoadOp>(
- loc, binaryAdaptor.getLhs(), loopIvs);
- auto loadedRhs = builder.create<AffineLoadOp>(
- loc, binaryAdaptor.getRhs(), loopIvs);
-
- // Create the binary operation performed on the loaded values.
- return builder.create<LoweredBinaryOp>(loc, loadedLhs, loadedRhs);
- });
+ lowerOpToLoops(op, operands, rewriter,
+ [loc](OpBuilder &builder, ValueRange memRefOperands,
+ ValueRange loopIvs) {
+ // Generate an adaptor for the remapped operands of the
+ // BinaryOp. This allows for using the nice named accessors
+ // that are generated by the ODS.
+ typename BinaryOp::Adaptor binaryAdaptor(memRefOperands);
+
+ // Generate loads for the element of 'lhs' and 'rhs' at the
+ // inner loop.
+ auto loadedLhs = builder.create<AffineLoadOp>(
+ loc, binaryAdaptor.getLhs(), loopIvs);
+ auto loadedRhs = builder.create<AffineLoadOp>(
+ loc, binaryAdaptor.getRhs(), loopIvs);
+
+ // Create the binary operation performed on the loaded
+ // values.
+ return builder.create<LoweredBinaryOp>(loc, loadedLhs,
+ loadedRhs);
+ });
return success();
}
};
diff --git a/mlir/examples/toy/Ch5/parser/AST.cpp b/mlir/examples/toy/Ch5/parser/AST.cpp
index 7b98b017d82dd..875b2e268ccd0 100644
--- a/mlir/examples/toy/Ch5/parser/AST.cpp
+++ b/mlir/examples/toy/Ch5/parser/AST.cpp
@@ -60,7 +60,8 @@ class ASTDumper {
} // namespace
/// Return a formatted string for the location of any node
-template <typename T> static std::string loc(T *node) {
+template <typename T>
+static std::string loc(T *node) {
const auto &loc = node->loc();
return (llvm::Twine("@") + *loc.file + ":" + llvm::Twine(loc.line) + ":" +
llvm::Twine(loc.col))
diff --git a/mlir/examples/toy/Ch6/mlir/LowerToAffineLoops.cpp b/mlir/examples/toy/Ch6/mlir/LowerToAffineLoops.cpp
index b518a287b6e14..5c8b1bcd21015 100644
--- a/mlir/examples/toy/Ch6/mlir/LowerToAffineLoops.cpp
+++ b/mlir/examples/toy/Ch6/mlir/LowerToAffineLoops.cpp
@@ -104,25 +104,26 @@ struct BinaryOpLowering : public ConversionPattern {
matchAndRewrite(Operation *op, ArrayRef<Value> operands,
ConversionPatternRewriter &rewriter) const final {
auto loc = op->getLoc();
- lowerOpToLoops(
- op, operands, rewriter,
- [loc](OpBuilder &builder, ValueRange memRefOperands,
- ValueRange loopIvs) {
- // Generate an adaptor for the remapped operands of the BinaryOp. This
- // allows for using the nice named accessors that are generated by the
- // ODS.
- typename BinaryOp::Adaptor binaryAdaptor(memRefOperands);
-
- // Generate loads for the element of 'lhs' and 'rhs' at the inner
- // loop.
- auto loadedLhs = builder.create<AffineLoadOp>(
- loc, binaryAdaptor.getLhs(), loopIvs);
- auto loadedRhs = builder.create<AffineLoadOp>(
- loc, binaryAdaptor.getRhs(), loopIvs);
-
- // Create the binary operation performed on the loaded values.
- return builder.create<LoweredBinaryOp>(loc, loadedLhs, loadedRhs);
- });
+ lowerOpToLoops(op, operands, rewriter,
+ [loc](OpBuilder &builder, ValueRange memRefOperands,
+ ValueRange loopIvs) {
+ // Generate an adaptor for the remapped operands of the
+ // BinaryOp. This allows for using the nice named accessors
+ // that are generated by the ODS.
+ typename BinaryOp::Adaptor binaryAdaptor(memRefOperands);
+
+ // Generate loads for the element of 'lhs' and 'rhs' at the
+ // inner loop.
+ auto loadedLhs = builder.create<AffineLoadOp>(
+ loc, binaryAdaptor.getLhs(), loopIvs);
+ auto loadedRhs = builder.create<AffineLoadOp>(
+ loc, binaryAdaptor.getRhs(), loopIvs);
+
+ // Create the binary operation performed on the loaded
+ // values.
+ return builder.create<LoweredBinaryOp>(loc, loadedLhs,
+ loadedRhs);
+ });
return success();
}
};
diff --git a/mlir/examples/toy/Ch6/parser/AST.cpp b/mlir/examples/toy/Ch6/parser/AST.cpp
index 7b98b017d82dd..875b2e268ccd0 100644
--- a/mlir/examples/toy/Ch6/parser/AST.cpp
+++ b/mlir/examples/toy/Ch6/parser/AST.cpp
@@ -60,7 +60,8 @@ class ASTDumper {
} // namespace
/// Return a formatted string for the location of any node
-template <typename T> static std::string loc(T *node) {
+template <typename T>
+static std::string loc(T *node) {
const auto &loc = node->loc();
return (llvm::Twine("@") + *loc.file + ":" + llvm::Twine(loc.line) + ":" +
llvm::Twine(loc.col))
diff --git a/mlir/examples/toy/Ch7/mlir/LowerToAffineLoops.cpp b/mlir/examples/toy/Ch7/mlir/LowerToAffineLoops.cpp
index b518a287b6e14..5c8b1bcd21015 100644
--- a/mlir/examples/toy/Ch7/mlir/LowerToAffineLoops.cpp
+++ b/mlir/examples/toy/Ch7/mlir/LowerToAffineLoops.cpp
@@ -104,25 +104,26 @@ struct BinaryOpLowering : public ConversionPattern {
matchAndRewrite(Operation *op, ArrayRef<Value> operands,
ConversionPatternRewriter &rewriter) const final {
auto loc = op->getLoc();
- lowerOpToLoops(
- op, operands, rewriter,
- [loc](OpBuilder &builder, ValueRange memRefOperands,
- ValueRange loopIvs) {
- // Generate an adaptor for the remapped operands of the BinaryOp. This
- // allows for using the nice named accessors that are generated by the
- // ODS.
- typename BinaryOp::Adaptor binaryAdaptor(memRefOperands);
-
- // Generate loads for the element of 'lhs' and 'rhs' at the inner
- // loop.
- auto loadedLhs = builder.create<AffineLoadOp>(
- loc, binaryAdaptor.getLhs(), loopIvs);
- auto loadedRhs = builder.create<AffineLoadOp>(
- loc, binaryAdaptor.getRhs(), loopIvs);
-
- // Create the binary operation performed on the loaded values.
- return builder.create<LoweredBinaryOp>(loc, loadedLhs, loadedRhs);
- });
+ lowerOpToLoops(op, operands, rewriter,
+ [loc](OpBuilder &builder, ValueRange memRefOperands,
+ ValueRange loopIvs) {
+ // Generate an adaptor for the remapped operands of the
+ // BinaryOp. This allows for using the nice named accessors
+ // that are generated by the ODS.
+ typename BinaryOp::Adaptor binaryAdaptor(memRefOperands);
+
+ // Generate loads for the element of 'lhs' and 'rhs' at the
+ // inner loop.
+ auto loadedLhs = builder.create<AffineLoadOp>(
+ loc, binaryAdaptor.getLhs(), loopIvs);
+ auto loadedRhs = builder.create<AffineLoadOp>(
+ loc, binaryAdaptor.getRhs(), loopIvs);
+
+ // Create the binary operation performed on the loaded
+ // values.
+ return builder.create<LoweredBinaryOp>(loc, loadedLhs,
+ loadedRhs);
+ });
return success();
}
};
diff --git a/mlir/examples/toy/Ch7/parser/AST.cpp b/mlir/examples/toy/Ch7/parser/AST.cpp
index 80c87dc21b48f..5ee5c4e02716b 100644
--- a/mlir/examples/toy/Ch7/parser/AST.cpp
+++ b/mlir/examples/toy/Ch7/parser/AST.cpp
@@ -62,7 +62,8 @@ class ASTDumper {
} // namespace
/// Return a formatted string for the location of any node
-template <typename T> static std::string loc(T *node) {
+template <typename T>
+static std::string loc(T *node) {
const auto &loc = node->loc();
return (llvm::Twine("@") + *loc.file + ":" + llvm::Twine(loc.line) + ":" +
llvm::Twine(loc.col))
diff --git a/mlir/include/mlir/Analysis/AliasAnalysis.h b/mlir/include/mlir/Analysis/AliasAnalysis.h
index 4fc31f3dbf9e9..fd36b2db3e50f 100644
--- a/mlir/include/mlir/Analysis/AliasAnalysis.h
+++ b/mlir/include/mlir/Analysis/AliasAnalysis.h
@@ -193,7 +193,8 @@ struct AliasAnalysisTraits {
/// `ImplT`. A model is instantiated for each alias analysis implementation
/// to implement the `Concept` without the need for the derived
/// implementation to inherit from the `Concept` class.
- template <typename ImplT> class Model final : public Concept {
+ template <typename ImplT>
+ class Model final : public Concept {
public:
explicit Model(ImplT &&impl) : impl(std::forward<ImplT>(impl)) {}
~Model() override = default;
diff --git a/mlir/include/mlir/Analysis/CallGraph.h b/mlir/include/mlir/Analysis/CallGraph.h
index 9238b95ccc0cf..fe7a6faffb4c7 100644
--- a/mlir/include/mlir/Analysis/CallGraph.h
+++ b/mlir/include/mlir/Analysis/CallGraph.h
@@ -221,7 +221,8 @@ class CallGraph {
namespace llvm {
// Provide graph traits for traversing call graphs using standard graph
// traversals.
-template <> struct GraphTraits<const mlir::CallGraphNode *> {
+template <>
+struct GraphTraits<const mlir::CallGraphNode *> {
using NodeRef = mlir::CallGraphNode *;
static NodeRef getEntryNode(NodeRef node) { return node; }
diff --git a/mlir/include/mlir/Bindings/Python/PybindAdaptors.h b/mlir/include/mlir/Bindings/Python/PybindAdaptors.h
index 582855a33afb4..588721c3f77c7 100644
--- a/mlir/include/mlir/Bindings/Python/PybindAdaptors.h
+++ b/mlir/include/mlir/Bindings/Python/PybindAdaptors.h
@@ -252,7 +252,7 @@ class pure_subclass {
}
template <typename Func, typename... Extra>
- pure_subclass &def(const char *name, Func &&f, const Extra &... extra) {
+ pure_subclass &def(const char *name, Func &&f, const Extra &...extra) {
py::cpp_function cf(
std::forward<Func>(f), py::name(name), py::is_method(thisClass),
py::sibling(py::getattr(thisClass, name, py::none())), extra...);
@@ -262,7 +262,7 @@ class pure_subclass {
template <typename Func, typename... Extra>
pure_subclass &def_property_readonly(const char *name, Func &&f,
- const Extra &... extra) {
+ const Extra &...extra) {
py::cpp_function cf(
std::forward<Func>(f), py::name(name), py::is_method(thisClass),
py::sibling(py::getattr(thisClass, name, py::none())), extra...);
@@ -274,7 +274,7 @@ class pure_subclass {
template <typename Func, typename... Extra>
pure_subclass &def_staticmethod(const char *name, Func &&f,
- const Extra &... extra) {
+ const Extra &...extra) {
static_assert(!std::is_member_function_pointer<Func>::value,
"def_staticmethod(...) called with a non-static member "
"function pointer");
@@ -287,7 +287,7 @@ class pure_subclass {
template <typename Func, typename... Extra>
pure_subclass &def_classmethod(const char *name, Func &&f,
- const Extra &... extra) {
+ const Extra &...extra) {
static_assert(!std::is_member_function_pointer<Func>::value,
"def_classmethod(...) called with a non-static member "
"function pointer");
diff --git a/mlir/include/mlir/Conversion/GPUToVulkan/ConvertGPUToVulkanPass.h b/mlir/include/mlir/Conversion/GPUToVulkan/ConvertGPUToVulkanPass.h
index 92e3f80b2be35..fe543886152ca 100644
--- a/mlir/include/mlir/Conversion/GPUToVulkan/ConvertGPUToVulkanPass.h
+++ b/mlir/include/mlir/Conversion/GPUToVulkan/ConvertGPUToVulkanPass.h
@@ -21,7 +21,8 @@
namespace mlir {
class ModuleOp;
-template <typename T> class OperationPass;
+template <typename T>
+class OperationPass;
std::unique_ptr<OperationPass<ModuleOp>>
createConvertVulkanLaunchFuncToVulkanCallsPass();
diff --git a/mlir/include/mlir/Dialect/Bufferization/IR/BufferizableOpInterface.h b/mlir/include/mlir/Dialect/Bufferization/IR/BufferizableOpInterface.h
index c5f6c129feead..64a37cffa2801 100644
--- a/mlir/include/mlir/Dialect/Bufferization/IR/BufferizableOpInterface.h
+++ b/mlir/include/mlir/Dialect/Bufferization/IR/BufferizableOpInterface.h
@@ -49,7 +49,8 @@ class OpFilter {
/// Allow the given dialects.
///
/// This function adds one or multiple ALLOW entries.
- template <typename... DialectTs> void allowDialect() {
+ template <typename... DialectTs>
+ void allowDialect() {
// The following expands a call to allowDialectImpl for each dialect
// in 'DialectTs'. This magic is necessary due to a limitation in the places
// that a parameter pack can be expanded in c++11.
@@ -60,7 +61,8 @@ class OpFilter {
/// Deny the given dialects.
///
/// This function adds one or multiple DENY entries.
- template <typename... DialectTs> void denyDialect() {
+ template <typename... DialectTs>
+ void denyDialect() {
// FIXME: In c++17 this can be simplified by using 'fold expressions'.
(void)std::initializer_list<int>{0, (denyDialectImpl<DialectTs>(), 0)...};
}
@@ -78,7 +80,8 @@ class OpFilter {
/// Allow the given ops.
///
/// This function adds one or multiple ALLOW entries.
- template <typename... OpTys> void allowOperation() {
+ template <typename... OpTys>
+ void allowOperation() {
// FIXME: In c++17 this can be simplified by using 'fold expressions'.
(void)std::initializer_list<int>{0, (allowOperationImpl<OpTys>(), 0)...};
}
@@ -86,7 +89,8 @@ class OpFilter {
/// Deny the given ops.
///
/// This function adds one or multiple DENY entries.
- template <typename... OpTys> void denyOperation() {
+ template <typename... OpTys>
+ void denyOperation() {
// FIXME: In c++17 this can be simplified by using 'fold expressions'.
(void)std::initializer_list<int>{0, (denyOperationImpl<OpTys>(), 0)...};
}
@@ -135,22 +139,26 @@ class OpFilter {
}
/// Allow a dialect.
- template <typename DialectT> void allowDialectImpl() {
+ template <typename DialectT>
+ void allowDialectImpl() {
allowDialect(DialectT::getDialectNamespace());
}
/// Deny a dialect.
- template <typename DialectT> void denyDialectImpl() {
+ template <typename DialectT>
+ void denyDialectImpl() {
denyDialect(DialectT::getDialectNamespace());
}
/// Allow an op.
- template <typename OpTy> void allowOperationImpl() {
+ template <typename OpTy>
+ void allowOperationImpl() {
allowOperation(OpTy::getOperationName());
}
/// Deny an op.
- template <typename OpTy> void denyOperationImpl() {
+ template <typename OpTy>
+ void denyOperationImpl() {
denyOperation(OpTy::getOperationName());
}
diff --git a/mlir/include/mlir/ExecutionEngine/ExecutionEngine.h b/mlir/include/mlir/ExecutionEngine/ExecutionEngine.h
index 2b5cd2a8e9659..190b6649a95f9 100644
--- a/mlir/include/mlir/ExecutionEngine/ExecutionEngine.h
+++ b/mlir/include/mlir/ExecutionEngine/ExecutionEngine.h
@@ -24,7 +24,8 @@
#include <memory>
namespace llvm {
-template <typename T> class Expected;
+template <typename T>
+class Expected;
class Module;
class ExecutionEngine;
class JITEventListener;
diff --git a/mlir/include/mlir/ExecutionEngine/SparseTensorUtils.h b/mlir/include/mlir/ExecutionEngine/SparseTensorUtils.h
index fba5012860725..2ed0002246544 100644
--- a/mlir/include/mlir/ExecutionEngine/SparseTensorUtils.h
+++ b/mlir/include/mlir/ExecutionEngine/SparseTensorUtils.h
@@ -182,8 +182,8 @@ FOREVERY_O(DECL_SPARSEINDICES)
/// Coordinate-scheme method for adding a new element.
#define DECL_ADDELT(VNAME, V) \
MLIR_CRUNNERUTILS_EXPORT void *_mlir_ciface_addElt##VNAME( \
- void *coo, \
- StridedMemRefType<V, 0> *vref, StridedMemRefType<index_type, 1> *iref, \
+ void *coo, StridedMemRefType<V, 0> *vref, \
+ StridedMemRefType<index_type, 1> *iref, \
StridedMemRefType<index_type, 1> *pref);
FOREVERY_V(DECL_ADDELT)
#undef DECL_ADDELT
diff --git a/mlir/include/mlir/IR/AffineExprVisitor.h b/mlir/include/mlir/IR/AffineExprVisitor.h
index 74d75c218e0b7..30ee1b6e0819c 100644
--- a/mlir/include/mlir/IR/AffineExprVisitor.h
+++ b/mlir/include/mlir/IR/AffineExprVisitor.h
@@ -65,7 +65,8 @@ namespace mlir {
/// just as efficient as having your own switch instruction over the instruction
/// opcode.
-template <typename SubClass, typename RetTy = void> class AffineExprVisitor {
+template <typename SubClass, typename RetTy = void>
+class AffineExprVisitor {
//===--------------------------------------------------------------------===//
// Interface code - This is the public interface of the AffineExprVisitor
// that you use to visit affine expressions...
diff --git a/mlir/include/mlir/IR/Attributes.h b/mlir/include/mlir/IR/Attributes.h
index 6c420f13ee1d4..1c38db9933d41 100644
--- a/mlir/include/mlir/IR/Attributes.h
+++ b/mlir/include/mlir/IR/Attributes.h
@@ -46,14 +46,18 @@ class Attribute {
bool operator!() const { return impl == nullptr; }
- template <typename U> bool isa() const;
+ template <typename U>
+ bool isa() const;
template <typename First, typename Second, typename... Rest>
bool isa() const;
template <typename First, typename... Rest>
bool isa_and_nonnull() const;
- template <typename U> U dyn_cast() const;
- template <typename U> U dyn_cast_or_null() const;
- template <typename U> U cast() const;
+ template <typename U>
+ U dyn_cast() const;
+ template <typename U>
+ U dyn_cast_or_null() const;
+ template <typename U>
+ U cast() const;
// Support dyn_cast'ing Attribute to itself.
static bool classof(Attribute) { return true; }
@@ -106,7 +110,8 @@ inline raw_ostream &operator<<(raw_ostream &os, Attribute attr) {
return os;
}
-template <typename U> bool Attribute::isa() const {
+template <typename U>
+bool Attribute::isa() const {
assert(impl && "isa<> used on a null attribute.");
return U::classof(*this);
}
@@ -121,13 +126,16 @@ bool Attribute::isa_and_nonnull() const {
return impl && isa<First, Rest...>();
}
-template <typename U> U Attribute::dyn_cast() const {
+template <typename U>
+U Attribute::dyn_cast() const {
return isa<U>() ? U(impl) : U(nullptr);
}
-template <typename U> U Attribute::dyn_cast_or_null() const {
+template <typename U>
+U Attribute::dyn_cast_or_null() const {
return (impl && isa<U>()) ? U(impl) : U(nullptr);
}
-template <typename U> U Attribute::cast() const {
+template <typename U>
+U Attribute::cast() const {
assert(isa<U>());
return U(impl);
}
@@ -248,7 +256,8 @@ using IsMutable = detail::StorageUserTrait::IsMutable<ConcreteType>;
namespace llvm {
// Attribute hash just like pointers.
-template <> struct DenseMapInfo<mlir::Attribute> {
+template <>
+struct DenseMapInfo<mlir::Attribute> {
static mlir::Attribute getEmptyKey() {
auto *pointer = llvm::DenseMapInfo<void *>::getEmptyKey();
return mlir::Attribute(static_cast<mlir::Attribute::ImplType *>(pointer));
@@ -280,7 +289,8 @@ struct DenseMapInfo<
};
/// Allow LLVM to steal the low bits of Attributes.
-template <> struct PointerLikeTypeTraits<mlir::Attribute> {
+template <>
+struct PointerLikeTypeTraits<mlir::Attribute> {
static inline void *getAsVoidPointer(mlir::Attribute attr) {
return const_cast<void *>(attr.getAsOpaquePointer());
}
@@ -291,7 +301,8 @@ template <> struct PointerLikeTypeTraits<mlir::Attribute> {
mlir::AttributeStorage *>::NumLowBitsAvailable;
};
-template <> struct DenseMapInfo<mlir::NamedAttribute> {
+template <>
+struct DenseMapInfo<mlir::NamedAttribute> {
static mlir::NamedAttribute getEmptyKey() {
auto emptyAttr = llvm::DenseMapInfo<mlir::Attribute>::getEmptyKey();
return mlir::NamedAttribute(emptyAttr, emptyAttr);
diff --git a/mlir/include/mlir/IR/BlockAndValueMapping.h b/mlir/include/mlir/IR/BlockAndValueMapping.h
index e6aea79683140..8134902bfd646 100644
--- a/mlir/include/mlir/IR/BlockAndValueMapping.h
+++ b/mlir/include/mlir/IR/BlockAndValueMapping.h
@@ -63,7 +63,8 @@ class BlockAndValueMapping {
/// Lookup a mapped value within the map. This asserts the provided value
/// exists within the map.
- template <typename T> T lookup(T from) const {
+ template <typename T>
+ T lookup(T from) const {
auto result = lookupOrNull(from);
assert(result && "expected 'from' to be contained within the map");
return result;
diff --git a/mlir/include/mlir/IR/BlockSupport.h b/mlir/include/mlir/IR/BlockSupport.h
index 78c4e2026ab5f..dafe75ed2acd3 100644
--- a/mlir/include/mlir/IR/BlockSupport.h
+++ b/mlir/include/mlir/IR/BlockSupport.h
@@ -52,7 +52,6 @@ class PredecessorIterator final
static Block *unwrap(BlockOperand &value);
public:
-
/// Initializes the operand type iterator to the specified operand iterator.
PredecessorIterator(ValueUseIterator<BlockOperand> it)
: llvm::mapped_iterator<ValueUseIterator<BlockOperand>,
@@ -162,7 +161,6 @@ class op_iterator
static OpT unwrap(Operation &op) { return cast<OpT>(op); }
public:
-
/// Initializes the iterator to the specified filter iterator.
op_iterator(op_filter_iterator<OpT, IteratorT> it)
: llvm::mapped_iterator<op_filter_iterator<OpT, IteratorT>,
@@ -225,7 +223,8 @@ struct SpecificNodeAccess<
};
} // namespace ilist_detail
-template <> struct ilist_traits<::mlir::Operation> {
+template <>
+struct ilist_traits<::mlir::Operation> {
using Operation = ::mlir::Operation;
using op_iterator = simple_ilist<Operation>::iterator;
diff --git a/mlir/include/mlir/IR/BuiltinAttributeInterfaces.h b/mlir/include/mlir/IR/BuiltinAttributeInterfaces.h
index 80ff95eca3ca8..e4da88f300b44 100644
--- a/mlir/include/mlir/IR/BuiltinAttributeInterfaces.h
+++ b/mlir/include/mlir/IR/BuiltinAttributeInterfaces.h
@@ -76,7 +76,8 @@ struct ElementsAttrIndexer {
}
/// Access the element at the given index.
- template <typename T> T at(uint64_t index) const {
+ template <typename T>
+ T at(uint64_t index) const {
if (isSplat)
index = 0;
return isContiguous ? conState.at<T>(index) : nonConState.at<T>(index);
@@ -93,7 +94,8 @@ struct ElementsAttrIndexer {
ContiguousState(const void *firstEltPtr) : firstEltPtr(firstEltPtr) {}
/// Access the element at the given index.
- template <typename T> const T &at(uint64_t index) const {
+ template <typename T>
+ const T &at(uint64_t index) const {
return *(reinterpret_cast<const T *>(firstEltPtr) + index);
}
@@ -171,7 +173,8 @@ struct ElementsAttrIndexer {
NonContiguousState(NonContiguousState &&other) = default;
/// Access the element at the given index.
- template <typename T> T at(uint64_t index) const {
+ template <typename T>
+ T at(uint64_t index) const {
auto *valueIt = static_cast<OpaqueIteratorValueBase<T> *>(iterator.get());
return valueIt->at(index);
}
diff --git a/mlir/include/mlir/IR/BuiltinAttributes.h b/mlir/include/mlir/IR/BuiltinAttributes.h
index f22f66fd6ac2c..a88dc7af99859 100644
--- a/mlir/include/mlir/IR/BuiltinAttributes.h
+++ b/mlir/include/mlir/IR/BuiltinAttributes.h
@@ -61,7 +61,8 @@ class DenseElementIndexedIteratorImpl
};
/// Type trait detector that checks if a given type T is a complex type.
-template <typename T> struct is_complex_t : public std::false_type {};
+template <typename T>
+struct is_complex_t : public std::false_type {};
template <typename T>
struct is_complex_t<std::complex<T>> : public std::true_type {};
} // namespace detail
@@ -81,7 +82,8 @@ class DenseElementsAttr : public Attribute {
/// floating point type that can be used to access the underlying element
/// types of a DenseElementsAttr.
// TODO: Use std::disjunction when C++17 is supported.
- template <typename T> struct is_valid_cpp_fp_type {
+ template <typename T>
+ struct is_valid_cpp_fp_type {
/// The type is a valid floating point type if it is a builtin floating
/// point type, or is a potentially user defined floating point type. The
/// latter allows for supporting users that have custom types defined for
diff --git a/mlir/include/mlir/IR/Diagnostics.h b/mlir/include/mlir/IR/Diagnostics.h
index f17ce961023da..0494cdaca0342 100644
--- a/mlir/include/mlir/IR/Diagnostics.h
+++ b/mlir/include/mlir/IR/Diagnostics.h
@@ -201,9 +201,7 @@ class Diagnostic {
/// Stream in an Operation.
Diagnostic &operator<<(Operation &val);
- Diagnostic &operator<<(Operation *val) {
- return *this << *val;
- }
+ Diagnostic &operator<<(Operation *val) { return *this << *val; }
/// Append an operation with the given printing flags.
Diagnostic &appendOp(Operation &val, const OpPrintingFlags &flags);
@@ -229,12 +227,13 @@ class Diagnostic {
/// Append arguments to the diagnostic.
template <typename Arg1, typename Arg2, typename... Args>
- Diagnostic &append(Arg1 &&arg1, Arg2 &&arg2, Args &&... args) {
+ Diagnostic &append(Arg1 &&arg1, Arg2 &&arg2, Args &&...args) {
append(std::forward<Arg1>(arg1));
return append(std::forward<Arg2>(arg2), std::forward<Args>(args)...);
}
/// Append one argument to the diagnostic.
- template <typename Arg> Diagnostic &append(Arg &&arg) {
+ template <typename Arg>
+ Diagnostic &append(Arg &&arg) {
*this << std::forward<Arg>(arg);
return *this;
}
@@ -323,21 +322,25 @@ class InFlightDiagnostic {
}
/// Stream operator for new diagnostic arguments.
- template <typename Arg> InFlightDiagnostic &operator<<(Arg &&arg) & {
+ template <typename Arg>
+ InFlightDiagnostic &operator<<(Arg &&arg) & {
return append(std::forward<Arg>(arg));
}
- template <typename Arg> InFlightDiagnostic &&operator<<(Arg &&arg) && {
+ template <typename Arg>
+ InFlightDiagnostic &&operator<<(Arg &&arg) && {
return std::move(append(std::forward<Arg>(arg)));
}
/// Append arguments to the diagnostic.
- template <typename... Args> InFlightDiagnostic &append(Args &&... args) & {
+ template <typename... Args>
+ InFlightDiagnostic &append(Args &&...args) & {
assert(isActive() && "diagnostic not active");
if (isInFlight())
impl->append(std::forward<Args>(args)...);
return *this;
}
- template <typename... Args> InFlightDiagnostic &&append(Args &&... args) && {
+ template <typename... Args>
+ InFlightDiagnostic &&append(Args &&...args) && {
return std::move(append(std::forward<Args>(args)...));
}
@@ -483,19 +486,19 @@ InFlightDiagnostic emitRemark(Location loc, const Twine &message);
/// the diagnostic arguments directly instead of relying on the returned
/// InFlightDiagnostic.
template <typename... Args>
-LogicalResult emitOptionalError(Optional<Location> loc, Args &&... args) {
+LogicalResult emitOptionalError(Optional<Location> loc, Args &&...args) {
if (loc)
return emitError(*loc).append(std::forward<Args>(args)...);
return failure();
}
template <typename... Args>
-LogicalResult emitOptionalWarning(Optional<Location> loc, Args &&... args) {
+LogicalResult emitOptionalWarning(Optional<Location> loc, Args &&...args) {
if (loc)
return emitWarning(*loc).append(std::forward<Args>(args)...);
return failure();
}
template <typename... Args>
-LogicalResult emitOptionalRemark(Optional<Location> loc, Args &&... args) {
+LogicalResult emitOptionalRemark(Optional<Location> loc, Args &&...args) {
if (loc)
return emitRemark(*loc).append(std::forward<Args>(args)...);
return failure();
@@ -520,7 +523,8 @@ class ScopedDiagnosticHandler {
protected:
/// Set the handler to manage via RAII.
- template <typename FuncTy> void setHandler(FuncTy &&handler) {
+ template <typename FuncTy>
+ void setHandler(FuncTy &&handler) {
auto &diagEngine = ctx->getDiagEngine();
if (handlerID)
diagEngine.eraseHandler(handlerID);
diff --git a/mlir/include/mlir/IR/Dialect.h b/mlir/include/mlir/IR/Dialect.h
index ee14ec088af46..d09d96d21d154 100644
--- a/mlir/include/mlir/IR/Dialect.h
+++ b/mlir/include/mlir/IR/Dialect.h
@@ -161,7 +161,8 @@ class Dialect {
auto it = registeredInterfaces.find(interfaceID);
return it != registeredInterfaces.end() ? it->getSecond().get() : nullptr;
}
- template <typename InterfaceT> const InterfaceT *getRegisteredInterface() {
+ template <typename InterfaceT>
+ const InterfaceT *getRegisteredInterface() {
return static_cast<const InterfaceT *>(
getRegisteredInterface(InterfaceT::getInterfaceID()));
}
@@ -201,13 +202,15 @@ class Dialect {
/// This method is used by derived classes to add their operations to the set.
///
- template <typename... Args> void addOperations() {
+ template <typename... Args>
+ void addOperations() {
(void)std::initializer_list<int>{
0, (RegisteredOperationName::insert<Args>(*this), 0)...};
}
/// Register a set of type classes with this dialect.
- template <typename... Args> void addTypes() {
+ template <typename... Args>
+ void addTypes() {
(void)std::initializer_list<int>{0, (addType<Args>(), 0)...};
}
@@ -217,7 +220,8 @@ class Dialect {
void addType(TypeID typeID, AbstractType &&typeInfo);
/// Register a set of attribute classes with this dialect.
- template <typename... Args> void addAttributes() {
+ template <typename... Args>
+ void addAttributes() {
(void)std::initializer_list<int>{0, (addAttribute<Args>(), 0)...};
}
@@ -237,14 +241,16 @@ class Dialect {
void operator=(Dialect &) = delete;
/// Register an attribute instance with this dialect.
- template <typename T> void addAttribute() {
+ template <typename T>
+ void addAttribute() {
// Add this attribute to the dialect and register it with the uniquer.
addAttribute(T::getTypeID(), AbstractAttribute::get<T>(*this));
detail::AttributeUniquer::registerAttribute<T>(context);
}
/// Register a type instance with this dialect.
- template <typename T> void addType() {
+ template <typename T>
+ void addType() {
// Add this type to the dialect and register it with the uniquer.
addType(T::getTypeID(), AbstractType::get<T>(*this));
detail::TypeUniquer::registerType<T>(context);
diff --git a/mlir/include/mlir/IR/DialectInterface.h b/mlir/include/mlir/IR/DialectInterface.h
index 8649e48dedfcd..2b3aa1211455c 100644
--- a/mlir/include/mlir/IR/DialectInterface.h
+++ b/mlir/include/mlir/IR/DialectInterface.h
@@ -126,10 +126,12 @@ class DialectInterfaceCollectionBase {
};
/// Iterator access to the held interfaces.
- template <typename InterfaceT> iterator<InterfaceT> interface_begin() const {
+ template <typename InterfaceT>
+ iterator<InterfaceT> interface_begin() const {
return iterator<InterfaceT>(orderedInterfaces.begin());
}
- template <typename InterfaceT> iterator<InterfaceT> interface_end() const {
+ template <typename InterfaceT>
+ iterator<InterfaceT> interface_end() const {
return iterator<InterfaceT>(orderedInterfaces.end());
}
diff --git a/mlir/include/mlir/IR/IntegerSet.h b/mlir/include/mlir/IR/IntegerSet.h
index 5d6aaea2388df..082e8bff78161 100644
--- a/mlir/include/mlir/IR/IntegerSet.h
+++ b/mlir/include/mlir/IR/IntegerSet.h
@@ -128,7 +128,8 @@ inline ::llvm::hash_code hash_value(IntegerSet arg) {
namespace llvm {
// IntegerSet hash just like pointers.
-template <> struct DenseMapInfo<mlir::IntegerSet> {
+template <>
+struct DenseMapInfo<mlir::IntegerSet> {
static mlir::IntegerSet getEmptyKey() {
auto *pointer = llvm::DenseMapInfo<void *>::getEmptyKey();
return mlir::IntegerSet(static_cast<mlir::IntegerSet::ImplType *>(pointer));
diff --git a/mlir/include/mlir/IR/Location.h b/mlir/include/mlir/IR/Location.h
index 16cd3889e5763..424d93ddf6c6d 100644
--- a/mlir/include/mlir/IR/Location.h
+++ b/mlir/include/mlir/IR/Location.h
@@ -62,9 +62,18 @@ class Location {
LocationAttr *operator->() const { return const_cast<LocationAttr *>(&impl); }
/// Type casting utilities on the underlying location.
- template <typename U> bool isa() const { return impl.isa<U>(); }
- template <typename U> U dyn_cast() const { return impl.dyn_cast<U>(); }
- template <typename U> U cast() const { return impl.cast<U>(); }
+ template <typename U>
+ bool isa() const {
+ return impl.isa<U>();
+ }
+ template <typename U>
+ U dyn_cast() const {
+ return impl.dyn_cast<U>();
+ }
+ template <typename U>
+ U cast() const {
+ return impl.cast<U>();
+ }
/// Comparison operators.
bool operator==(Location rhs) const { return impl == rhs.impl; }
@@ -128,7 +137,8 @@ inline OpaqueLoc OpaqueLoc::get(T underlyingLocation, MLIRContext *context) {
namespace llvm {
// Type hash just like pointers.
-template <> struct DenseMapInfo<mlir::Location> {
+template <>
+struct DenseMapInfo<mlir::Location> {
static mlir::Location getEmptyKey() {
auto *pointer = llvm::DenseMapInfo<void *>::getEmptyKey();
return mlir::Location::getFromOpaquePointer(pointer);
@@ -146,7 +156,8 @@ template <> struct DenseMapInfo<mlir::Location> {
};
/// We align LocationStorage by 8, so allow LLVM to steal the low bits.
-template <> struct PointerLikeTypeTraits<mlir::Location> {
+template <>
+struct PointerLikeTypeTraits<mlir::Location> {
public:
static inline void *getAsVoidPointer(mlir::Location I) {
return const_cast<void *>(I.getAsOpaquePointer());
diff --git a/mlir/include/mlir/IR/OpDefinition.h b/mlir/include/mlir/IR/OpDefinition.h
index 427c606fd90e9..1e8f93a895733 100644
--- a/mlir/include/mlir/IR/OpDefinition.h
+++ b/mlir/include/mlir/IR/OpDefinition.h
@@ -1732,14 +1732,16 @@ class Op : public OpState, public Traits<ConcreteType>... {
struct InterfaceTargetOrOpT {
using type = typename T::ConcreteEntity;
};
- template <typename T> struct InterfaceTargetOrOpT<T, false> {
+ template <typename T>
+ struct InterfaceTargetOrOpT<T, false> {
using type = ConcreteType;
};
/// A hook for static assertion that the external interface model T is
/// targeting the concrete type of this op. The model can also be a fallback
/// model that works for every op.
- template <typename T> static void checkInterfaceTarget() {
+ template <typename T>
+ static void checkInterfaceTarget() {
static_assert(std::is_same<typename InterfaceTargetOrOpT<T>::type,
ConcreteType>::value,
"attaching an interface to the wrong op kind");
diff --git a/mlir/include/mlir/IR/OpImplementation.h b/mlir/include/mlir/IR/OpImplementation.h
index cb240a40e0c79..c4bbac91bd938 100644
--- a/mlir/include/mlir/IR/OpImplementation.h
+++ b/mlir/include/mlir/IR/OpImplementation.h
@@ -151,10 +151,9 @@ class AsmPrinter {
std::enable_if_t<detect_has_print_method<AttrOrType>::value>
*sfinae = nullptr>
void printStrippedAttrOrType(ArrayRef<AttrOrType> attrOrTypes) {
- llvm::interleaveComma(attrOrTypes, getStream(),
- [this](AttrOrType attrOrType) {
- printStrippedAttrOrType(attrOrType);
- });
+ llvm::interleaveComma(
+ attrOrTypes, getStream(),
+ [this](AttrOrType attrOrType) { printStrippedAttrOrType(attrOrType); });
}
/// SFINAE for printing the provided attribute in the context of an operation
diff --git a/mlir/include/mlir/IR/OperationSupport.h b/mlir/include/mlir/IR/OperationSupport.h
index 83dd9eab4964b..825ba95bf080a 100644
--- a/mlir/include/mlir/IR/OperationSupport.h
+++ b/mlir/include/mlir/IR/OperationSupport.h
@@ -141,7 +141,8 @@ class OperationName {
/// Returns true if the operation was registered with a particular trait, e.g.
/// hasTrait<OperandsAreSignlessIntegerLike>(). Returns false if the operation
/// is unregistered.
- template <template <typename T> class Trait> bool hasTrait() const {
+ template <template <typename T> class Trait>
+ bool hasTrait() const {
return hasTrait(TypeID::get<Trait>());
}
bool hasTrait(TypeID traitID) const {
@@ -151,7 +152,8 @@ class OperationName {
/// Returns true if the operation *might* have the provided trait. This
/// means that either the operation is unregistered, or it was registered with
/// the provide trait.
- template <template <typename T> class Trait> bool mightHaveTrait() const {
+ template <template <typename T> class Trait>
+ bool mightHaveTrait() const {
return mightHaveTrait(TypeID::get<Trait>());
}
bool mightHaveTrait(TypeID traitID) const {
@@ -161,12 +163,14 @@ class OperationName {
/// Returns an instance of the concept object for the given interface if it
/// was registered to this operation, null otherwise. This should not be used
/// directly.
- template <typename T> typename T::Concept *getInterface() const {
+ template <typename T>
+ typename T::Concept *getInterface() const {
return impl->interfaceMap.lookup<T>();
}
/// Returns true if this operation has the given interface registered to it.
- template <typename T> bool hasInterface() const {
+ template <typename T>
+ bool hasInterface() const {
return hasInterface(TypeID::get<T>());
}
bool hasInterface(TypeID interfaceID) const {
@@ -345,7 +349,8 @@ class RegisteredOperationName : public OperationName {
}
/// Returns true if the operation has a particular trait.
- template <template <typename T> class Trait> bool hasTrait() const {
+ template <template <typename T> class Trait>
+ bool hasTrait() const {
return hasTrait(TypeID::get<Trait>());
}
diff --git a/mlir/include/mlir/IR/PatternMatch.h b/mlir/include/mlir/IR/PatternMatch.h
index f3236dcff7fac..0858908ffb73e 100644
--- a/mlir/include/mlir/IR/PatternMatch.h
+++ b/mlir/include/mlir/IR/PatternMatch.h
@@ -271,7 +271,7 @@ class RewritePattern : public Pattern {
/// This method provides a convenient interface for creating and initializing
/// derived rewrite patterns of the given type `T`.
template <typename T, typename... Args>
- static std::unique_ptr<T> create(Args &&... args) {
+ static std::unique_ptr<T> create(Args &&...args) {
std::unique_ptr<T> pattern =
std::make_unique<T>(std::forward<Args>(args)...);
initializePattern<T>(*pattern);
@@ -1410,7 +1410,7 @@ class RewritePatternSet {
template <typename... Ts, typename ConstructorArg,
typename... ConstructorArgs,
typename = std::enable_if_t<sizeof...(Ts) != 0>>
- RewritePatternSet &add(ConstructorArg &&arg, ConstructorArgs &&... args) {
+ RewritePatternSet &add(ConstructorArg &&arg, ConstructorArgs &&...args) {
// The following expands a call to emplace_back for each of the pattern
// types 'Ts'. This magic is necessary due to a limitation in the places
// that a parameter pack can be expanded in c++11.
@@ -1428,7 +1428,7 @@ class RewritePatternSet {
typename = std::enable_if_t<sizeof...(Ts) != 0>>
RewritePatternSet &addWithLabel(ArrayRef<StringRef> debugLabels,
ConstructorArg &&arg,
- ConstructorArgs &&... args) {
+ ConstructorArgs &&...args) {
// The following expands a call to emplace_back for each of the pattern
// types 'Ts'. This magic is necessary due to a limitation in the places
// that a parameter pack can be expanded in c++11.
@@ -1493,7 +1493,7 @@ class RewritePatternSet {
template <typename... Ts, typename ConstructorArg,
typename... ConstructorArgs,
typename = std::enable_if_t<sizeof...(Ts) != 0>>
- RewritePatternSet &insert(ConstructorArg &&arg, ConstructorArgs &&... args) {
+ RewritePatternSet &insert(ConstructorArg &&arg, ConstructorArgs &&...args) {
// The following expands a call to emplace_back for each of the pattern
// types 'Ts'. This magic is necessary due to a limitation in the places
// that a parameter pack can be expanded in c++11.
@@ -1553,7 +1553,7 @@ class RewritePatternSet {
/// chaining insertions.
template <typename T, typename... Args>
std::enable_if_t<std::is_base_of<RewritePattern, T>::value>
- addImpl(ArrayRef<StringRef> debugLabels, Args &&... args) {
+ addImpl(ArrayRef<StringRef> debugLabels, Args &&...args) {
std::unique_ptr<T> pattern =
RewritePattern::create<T>(std::forward<Args>(args)...);
pattern->addDebugLabels(debugLabels);
@@ -1561,7 +1561,7 @@ class RewritePatternSet {
}
template <typename T, typename... Args>
std::enable_if_t<std::is_base_of<PDLPatternModule, T>::value>
- addImpl(ArrayRef<StringRef> debugLabels, Args &&... args) {
+ addImpl(ArrayRef<StringRef> debugLabels, Args &&...args) {
// TODO: Add the provided labels to the PDL pattern when PDL supports
// labels.
pdlPatterns.mergeIn(T(std::forward<Args>(args)...));
diff --git a/mlir/include/mlir/IR/RegionGraphTraits.h b/mlir/include/mlir/IR/RegionGraphTraits.h
index 5093c57935e11..498064e3c11cf 100644
--- a/mlir/include/mlir/IR/RegionGraphTraits.h
+++ b/mlir/include/mlir/IR/RegionGraphTraits.h
@@ -19,7 +19,8 @@
#include "llvm/ADT/GraphTraits.h"
namespace llvm {
-template <> struct GraphTraits<mlir::Block *> {
+template <>
+struct GraphTraits<mlir::Block *> {
using ChildIteratorType = mlir::Block::succ_iterator;
using Node = mlir::Block;
using NodeRef = Node *;
@@ -32,7 +33,8 @@ template <> struct GraphTraits<mlir::Block *> {
static ChildIteratorType child_end(NodeRef node) { return node->succ_end(); }
};
-template <> struct GraphTraits<Inverse<mlir::Block *>> {
+template <>
+struct GraphTraits<Inverse<mlir::Block *>> {
using ChildIteratorType = mlir::Block::pred_iterator;
using Node = mlir::Block;
using NodeRef = Node *;
diff --git a/mlir/include/mlir/IR/StorageUniquerSupport.h b/mlir/include/mlir/IR/StorageUniquerSupport.h
index 7aaa6881ebd8f..7e17ba4fd7cd8 100644
--- a/mlir/include/mlir/IR/StorageUniquerSupport.h
+++ b/mlir/include/mlir/IR/StorageUniquerSupport.h
@@ -105,7 +105,8 @@ class StorageUserBase : public BaseT, public Traits<ConcreteT>... {
/// Provide an implementation of 'classof' that compares the type id of the
/// provided value with that of the concrete type.
- template <typename T> static bool classof(T val) {
+ template <typename T>
+ static bool classof(T val) {
static_assert(std::is_convertible<ConcreteT, T>::value,
"casting from a non-convertible type");
return val.getTypeID() == getTypeID();
@@ -182,7 +183,8 @@ class StorageUserBase : public BaseT, public Traits<ConcreteT>... {
protected:
/// Mutate the current storage instance. This will not change the unique key.
/// The arguments are forwarded to 'ConcreteT::mutate'.
- template <typename... Args> LogicalResult mutate(Args &&...args) {
+ template <typename... Args>
+ LogicalResult mutate(Args &&...args) {
static_assert(std::is_base_of<StorageUserTrait::IsMutable<ConcreteT>,
ConcreteT>::value,
"The `mutate` function expects mutable trait "
@@ -192,7 +194,8 @@ class StorageUserBase : public BaseT, public Traits<ConcreteT>... {
}
/// Default implementation that just returns success.
- template <typename... Args> static LogicalResult verify(Args... args) {
+ template <typename... Args>
+ static LogicalResult verify(Args... args) {
return success();
}
diff --git a/mlir/include/mlir/IR/TypeSupport.h b/mlir/include/mlir/IR/TypeSupport.h
index 358ab4055430a..b11168712d40b 100644
--- a/mlir/include/mlir/IR/TypeSupport.h
+++ b/mlir/include/mlir/IR/TypeSupport.h
@@ -59,7 +59,8 @@ class AbstractType {
/// Returns an instance of the concept object for the given interface if it
/// was registered to this type, null otherwise. This should not be used
/// directly.
- template <typename T> typename T::Concept *getInterface() const {
+ template <typename T>
+ typename T::Concept *getInterface() const {
return interfaceMap.lookup<T>();
}
diff --git a/mlir/include/mlir/IR/Types.h b/mlir/include/mlir/IR/Types.h
index 4efc838d021d1..d19f1feaf51d7 100644
--- a/mlir/include/mlir/IR/Types.h
+++ b/mlir/include/mlir/IR/Types.h
@@ -94,11 +94,16 @@ class Type {
bool operator!() const { return impl == nullptr; }
- template <typename U> bool isa() const;
- template <typename First, typename Second, typename... Rest> bool isa() const;
- template <typename U> U dyn_cast() const;
- template <typename U> U dyn_cast_or_null() const;
- template <typename U> U cast() const;
+ template <typename U>
+ bool isa() const;
+ template <typename First, typename Second, typename... Rest>
+ bool isa() const;
+ template <typename U>
+ U dyn_cast() const;
+ template <typename U>
+ U dyn_cast_or_null() const;
+ template <typename U>
+ U cast() const;
// Support type casting Type to itself.
static bool classof(Type) { return true; }
@@ -243,7 +248,8 @@ inline ::llvm::hash_code hash_value(Type arg) {
return DenseMapInfo<const Type::ImplType *>::getHashValue(arg.impl);
}
-template <typename U> bool Type::isa() const {
+template <typename U>
+bool Type::isa() const {
assert(impl && "isa<> used on a null type.");
return U::classof(*this);
}
@@ -253,13 +259,16 @@ bool Type::isa() const {
return isa<First>() || isa<Second, Rest...>();
}
-template <typename U> U Type::dyn_cast() const {
+template <typename U>
+U Type::dyn_cast() const {
return isa<U>() ? U(impl) : U(nullptr);
}
-template <typename U> U Type::dyn_cast_or_null() const {
+template <typename U>
+U Type::dyn_cast_or_null() const {
return (impl && isa<U>()) ? U(impl) : U(nullptr);
}
-template <typename U> U Type::cast() const {
+template <typename U>
+U Type::cast() const {
assert(isa<U>());
return U(impl);
}
@@ -269,7 +278,8 @@ template <typename U> U Type::cast() const {
namespace llvm {
// Type hash just like pointers.
-template <> struct DenseMapInfo<mlir::Type> {
+template <>
+struct DenseMapInfo<mlir::Type> {
static mlir::Type getEmptyKey() {
auto *pointer = llvm::DenseMapInfo<void *>::getEmptyKey();
return mlir::Type(static_cast<mlir::Type::ImplType *>(pointer));
@@ -296,7 +306,8 @@ struct DenseMapInfo<T, std::enable_if_t<std::is_base_of<mlir::Type, T>::value &&
};
/// We align TypeStorage by 8, so allow LLVM to steal the low bits.
-template <> struct PointerLikeTypeTraits<mlir::Type> {
+template <>
+struct PointerLikeTypeTraits<mlir::Type> {
public:
static inline void *getAsVoidPointer(mlir::Type I) {
return const_cast<void *>(I.getAsOpaquePointer());
diff --git a/mlir/include/mlir/IR/UseDefLists.h b/mlir/include/mlir/IR/UseDefLists.h
index 845e403edcfbb..197953698efc2 100644
--- a/mlir/include/mlir/IR/UseDefLists.h
+++ b/mlir/include/mlir/IR/UseDefLists.h
@@ -20,9 +20,12 @@
namespace mlir {
class Operation;
-template <typename OperandType> class ValueUseIterator;
-template <typename OperandType> class FilteredValueUseIterator;
-template <typename UseIteratorT, typename OperandType> class ValueUserIterator;
+template <typename OperandType>
+class ValueUseIterator;
+template <typename OperandType>
+class FilteredValueUseIterator;
+template <typename UseIteratorT, typename OperandType>
+class ValueUserIterator;
//===----------------------------------------------------------------------===//
// IROperand
@@ -77,7 +80,8 @@ class IROperandBase {
}
/// Insert this operand into the given use list.
- template <typename UseListT> void insertInto(UseListT *useList) {
+ template <typename UseListT>
+ void insertInto(UseListT *useList) {
back = &useList->firstUse;
nextUse = useList->firstUse;
if (nextUse)
@@ -164,7 +168,8 @@ class IROperand : public detail::IROperandBase {
//===----------------------------------------------------------------------===//
/// This class represents a single IR object that contains a use list.
-template <typename OperandType> class IRObjectWithUseList {
+template <typename OperandType>
+class IRObjectWithUseList {
public:
~IRObjectWithUseList() {
assert(use_empty() && "Cannot destroy a value that still has uses!");
diff --git a/mlir/include/mlir/Interfaces/SideEffectInterfaces.h b/mlir/include/mlir/Interfaces/SideEffectInterfaces.h
index 5e88a92283f5f..e5f4f2bf63fdb 100644
--- a/mlir/include/mlir/Interfaces/SideEffectInterfaces.h
+++ b/mlir/include/mlir/Interfaces/SideEffectInterfaces.h
@@ -53,7 +53,8 @@ class Effect {
TypeID getEffectID() const { return id; }
/// Returns a unique instance for the given effect class.
- template <typename DerivedEffect> static DerivedEffect *get() {
+ template <typename DerivedEffect>
+ static DerivedEffect *get() {
static_assert(std::is_base_of<Effect, DerivedEffect>::value,
"expected DerivedEffect to inherit from Effect");
@@ -134,7 +135,8 @@ struct AutomaticAllocationScopeResource
/// applied, and an optional symbol reference or value(either operand, result,
/// or region entry argument) that the effect is applied to, and an optional
/// parameters attribute further specifying the details of the effect.
-template <typename EffectT> class EffectInstance {
+template <typename EffectT>
+class EffectInstance {
public:
EffectInstance(EffectT *effect, Resource *resource = DefaultResource::get())
: effect(effect), resource(resource) {}
diff --git a/mlir/include/mlir/Pass/AnalysisManager.h b/mlir/include/mlir/Pass/AnalysisManager.h
index 6a124dbc9321e..41ecd8a306804 100644
--- a/mlir/include/mlir/Pass/AnalysisManager.h
+++ b/mlir/include/mlir/Pass/AnalysisManager.h
@@ -43,7 +43,8 @@ class PreservedAnalyses {
bool isNone() const { return preservedIDs.empty(); }
/// Preserve the given analyses.
- template <typename AnalysisT> void preserve() {
+ template <typename AnalysisT>
+ void preserve() {
preserve(TypeID::get<AnalysisT>());
}
template <typename AnalysisT, typename AnalysisT2, typename... OtherAnalysesT>
@@ -56,7 +57,8 @@ class PreservedAnalyses {
/// Returns true if the given analysis has been marked as preserved. Note that
/// this simply checks for the presence of a given analysis ID and should not
/// be used as a general preservation checker.
- template <typename AnalysisT> bool isPreserved() const {
+ template <typename AnalysisT>
+ bool isPreserved() const {
return isPreserved(TypeID::get<AnalysisT>());
}
bool isPreserved(TypeID id) const { return preservedIDs.count(id); }
@@ -110,7 +112,8 @@ struct AnalysisConcept {
};
/// A derived analysis model used to hold a specific analysis object.
-template <typename AnalysisT> struct AnalysisModel : public AnalysisConcept {
+template <typename AnalysisT>
+struct AnalysisModel : public AnalysisConcept {
template <typename... Args>
explicit AnalysisModel(Args &&...args)
: analysis(std::forward<Args>(args)...) {}
@@ -135,7 +138,8 @@ class AnalysisMap {
using ConceptMap = llvm::MapVector<TypeID, std::unique_ptr<AnalysisConcept>>;
/// Utility to return the name of the given analysis class.
- template <typename AnalysisT> static StringRef getAnalysisName() {
+ template <typename AnalysisT>
+ static StringRef getAnalysisName() {
StringRef name = llvm::getTypeName<AnalysisT>();
if (!name.consume_front("mlir::"))
name.consume_front("(anonymous namespace)::");
@@ -309,7 +313,8 @@ class AnalysisManager {
}
/// Query for the given analysis for the current operation.
- template <typename AnalysisT> AnalysisT &getAnalysis() {
+ template <typename AnalysisT>
+ AnalysisT &getAnalysis() {
return impl->analyses.getAnalysis<AnalysisT>(getPassInstrumentor(), *this);
}
@@ -328,7 +333,8 @@ class AnalysisManager {
}
/// Query for an analysis of a child operation, constructing it if necessary.
- template <typename AnalysisT> AnalysisT &getChildAnalysis(Operation *op) {
+ template <typename AnalysisT>
+ AnalysisT &getChildAnalysis(Operation *op) {
return nest(op).template getAnalysis<AnalysisT>();
}
diff --git a/mlir/include/mlir/Pass/Pass.h b/mlir/include/mlir/Pass/Pass.h
index 30ae5ae244fcb..1db6ef6e61444 100644
--- a/mlir/include/mlir/Pass/Pass.h
+++ b/mlir/include/mlir/Pass/Pass.h
@@ -212,7 +212,8 @@ class Pass {
void signalPassFailure() { getPassState().irAndPassFailed.setInt(true); }
/// Query an analysis for the current ir unit.
- template <typename AnalysisT> AnalysisT &getAnalysis() {
+ template <typename AnalysisT>
+ AnalysisT &getAnalysis() {
return getAnalysisManager().getAnalysis<AnalysisT>();
}
@@ -236,7 +237,8 @@ class Pass {
}
/// Mark the provided analyses as preserved.
- template <typename... AnalysesT> void markAnalysesPreserved() {
+ template <typename... AnalysesT>
+ void markAnalysesPreserved() {
getPassState().preservedAnalyses.preserve<AnalysesT...>();
}
void markAnalysesPreserved(TypeID id) {
@@ -266,7 +268,8 @@ class Pass {
/// Returns the analysis for the given child operation, or creates it if it
/// doesn't exist.
- template <typename AnalysisT> AnalysisT &getChildAnalysis(Operation *child) {
+ template <typename AnalysisT>
+ AnalysisT &getChildAnalysis(Operation *child) {
return getAnalysisManager().getChildAnalysis<AnalysisT>(child);
}
@@ -343,7 +346,8 @@ class Pass {
/// - A 'void runOnOperation()' method.
/// - A 'StringRef getName() const' method.
/// - A 'std::unique_ptr<Pass> clonePass() const' method.
-template <typename OpT = void> class OperationPass : public Pass {
+template <typename OpT = void>
+class OperationPass : public Pass {
protected:
OperationPass(TypeID passID) : Pass(passID, OpT::getOperationName()) {}
OperationPass(const OperationPass &) = default;
@@ -381,7 +385,8 @@ template <typename OpT = void> class OperationPass : public Pass {
/// - A 'void runOnOperation()' method.
/// - A 'StringRef getName() const' method.
/// - A 'std::unique_ptr<Pass> clonePass() const' method.
-template <> class OperationPass<void> : public Pass {
+template <>
+class OperationPass<void> : public Pass {
protected:
OperationPass(TypeID passID) : Pass(passID) {}
OperationPass(const OperationPass &) = default;
@@ -431,7 +436,8 @@ class InterfacePass : public OperationPass<> {
/// several necessary utility methods. This should only be used for passes that
/// are not suitably represented using the declarative pass specification(i.e.
/// tablegen backend).
-template <typename PassT, typename BaseT> class PassWrapper : public BaseT {
+template <typename PassT, typename BaseT>
+class PassWrapper : public BaseT {
public:
/// Support isa/dyn_cast functionality for the derived pass class.
static bool classof(const Pass *pass) {
diff --git a/mlir/include/mlir/Pass/PassInstrumentation.h b/mlir/include/mlir/Pass/PassInstrumentation.h
index a0b1f62d774f2..a99cafbf26864 100644
--- a/mlir/include/mlir/Pass/PassInstrumentation.h
+++ b/mlir/include/mlir/Pass/PassInstrumentation.h
@@ -125,7 +125,8 @@ class PassInstrumentor {
} // namespace mlir
namespace llvm {
-template <> struct DenseMapInfo<mlir::PassInstrumentation::PipelineParentInfo> {
+template <>
+struct DenseMapInfo<mlir::PassInstrumentation::PipelineParentInfo> {
using T = mlir::PassInstrumentation::PipelineParentInfo;
using PairInfo = DenseMapInfo<std::pair<uint64_t, void *>>;
diff --git a/mlir/include/mlir/Pass/PassManager.h b/mlir/include/mlir/Pass/PassManager.h
index 189e8bcd8ba50..ec858a7415ab1 100644
--- a/mlir/include/mlir/Pass/PassManager.h
+++ b/mlir/include/mlir/Pass/PassManager.h
@@ -98,7 +98,8 @@ class OpPassManager {
/// pass manager.
OpPassManager &nest(OperationName nestedName);
OpPassManager &nest(StringRef nestedName);
- template <typename OpT> OpPassManager &nest() {
+ template <typename OpT>
+ OpPassManager &nest() {
return nest(OpT::getOperationName());
}
@@ -115,7 +116,8 @@ class OpPassManager {
/// Add the given pass to a nested pass manager for the given operation kind
/// `OpT`.
- template <typename OpT> void addNestedPass(std::unique_ptr<Pass> pass) {
+ template <typename OpT>
+ void addNestedPass(std::unique_ptr<Pass> pass) {
nest<OpT>().addPass(std::move(pass));
}
diff --git a/mlir/include/mlir/Pass/PassRegistry.h b/mlir/include/mlir/Pass/PassRegistry.h
index 213f36abef268..26f5791897424 100644
--- a/mlir/include/mlir/Pass/PassRegistry.h
+++ b/mlir/include/mlir/Pass/PassRegistry.h
@@ -140,7 +140,8 @@ void registerPass(const PassAllocatorFunction &function);
/// /// At namespace scope.
/// static PassRegistration<MyPass> reg;
///
-template <typename ConcretePass> struct PassRegistration {
+template <typename ConcretePass>
+struct PassRegistration {
PassRegistration(const PassAllocatorFunction &constructor) {
registerPass(constructor);
}
@@ -184,7 +185,8 @@ struct PassPipelineRegistration {
/// Convenience specialization of PassPipelineRegistration for EmptyPassOptions
/// that does not pass an empty options struct to the pass builder function.
-template <> struct PassPipelineRegistration<EmptyPipelineOptions> {
+template <>
+struct PassPipelineRegistration<EmptyPipelineOptions> {
PassPipelineRegistration(
StringRef arg, StringRef description,
const std::function<void(OpPassManager &)> &builder) {
diff --git a/mlir/include/mlir/Support/DebugAction.h b/mlir/include/mlir/Support/DebugAction.h
index ceb74fe5fd82e..49f1d2744bdbc 100644
--- a/mlir/include/mlir/Support/DebugAction.h
+++ b/mlir/include/mlir/Support/DebugAction.h
@@ -107,13 +107,13 @@ class DebugActionManager {
/// `Args` are a set of parameters used by handlers of `ActionType` to
/// determine if the action should be executed.
template <typename ActionType, typename... Args>
- bool shouldExecute(Args &&... args) {
+ bool shouldExecute(Args &&...args) {
// The manager is always disabled if built without debug.
#if !LLVM_ENABLE_ABI_BREAKING_CHECKS
return true;
#else
// Invoke the `shouldExecute` method on the provided handler.
- auto shouldExecuteFn = [&](auto *handler, auto &&... handlerParams) {
+ auto shouldExecuteFn = [&](auto *handler, auto &&...handlerParams) {
return handler->shouldExecute(
std::forward<decltype(handlerParams)>(handlerParams)...);
};
@@ -139,7 +139,7 @@ class DebugActionManager {
template <typename ActionType, typename ResultT, typename HandlerCallbackT,
typename... Args>
FailureOr<ResultT> dispatchToHandler(HandlerCallbackT &&handlerCallback,
- Args &&... args) {
+ Args &&...args) {
static_assert(ActionType::template canHandleWith<Args...>(),
"cannot execute action with the given set of parameters");
@@ -189,7 +189,8 @@ class DebugActionManager {
/// This class provides a handler class that can be derived from to handle
/// instances of this action. The parameters to its query methods map 1-1 to the
/// types on the action type.
-template <typename... ParameterTs> class DebugAction {
+template <typename... ParameterTs>
+class DebugAction {
public:
class Handler : public DebugActionManager::HandlerBase {
public:
diff --git a/mlir/include/mlir/Support/InterfaceSupport.h b/mlir/include/mlir/Support/InterfaceSupport.h
index 02eaa1bb78bec..53ace04453ac3 100644
--- a/mlir/include/mlir/Support/InterfaceSupport.h
+++ b/mlir/include/mlir/Support/InterfaceSupport.h
@@ -71,7 +71,8 @@ template <typename ConcreteType, typename ValueT, typename Traits,
class Interface : public BaseType {
public:
using Concept = typename Traits::Concept;
- template <typename T> using Model = typename Traits::template Model<T>;
+ template <typename T>
+ using Model = typename Traits::template Model<T>;
template <typename T>
using FallbackModel = typename Traits::template FallbackModel<T>;
using InterfaceBase =
@@ -205,7 +206,8 @@ class InterfaceMap {
/// Returns an instance of the concept object for the given interface if it
/// was registered to this map, null otherwise.
- template <typename T> typename T::Concept *lookup() const {
+ template <typename T>
+ typename T::Concept *lookup() const {
return reinterpret_cast<typename T::Concept *>(lookup(T::getInterfaceID()));
}
diff --git a/mlir/include/mlir/Support/LLVM.h b/mlir/include/mlir/Support/LLVM.h
index 60eb7d0f9d2af..bb7e5b91900af 100644
--- a/mlir/include/mlir/Support/LLVM.h
+++ b/mlir/include/mlir/Support/LLVM.h
@@ -35,41 +35,60 @@
// Forward declarations.
namespace llvm {
// String types
-template <unsigned N> class SmallString;
+template <unsigned N>
+class SmallString;
class StringRef;
class StringLiteral;
class Twine;
// Containers.
-template <typename T> class ArrayRef;
+template <typename T>
+class ArrayRef;
class BitVector;
namespace detail {
-template <typename KeyT, typename ValueT> struct DenseMapPair;
+template <typename KeyT, typename ValueT>
+struct DenseMapPair;
} // namespace detail
template <typename KeyT, typename ValueT, typename KeyInfoT, typename BucketT>
class DenseMap;
-template <typename T, typename Enable> struct DenseMapInfo;
-template <typename ValueT, typename ValueInfoT> class DenseSet;
+template <typename T, typename Enable>
+struct DenseMapInfo;
+template <typename ValueT, typename ValueInfoT>
+class DenseSet;
class MallocAllocator;
-template <typename T> class MutableArrayRef;
-template <typename T> class Optional;
-template <typename... PT> class PointerUnion;
-template <typename T, typename Vector, typename Set> class SetVector;
-template <typename T, unsigned N> class SmallPtrSet;
-template <typename T> class SmallPtrSetImpl;
-template <typename T, unsigned N> class SmallVector;
-template <typename T> class SmallVectorImpl;
-template <typename AllocatorTy> class StringSet;
-template <typename T, typename R> class StringSwitch;
-template <typename T> class TinyPtrVector;
-template <typename T, typename ResultT> class TypeSwitch;
+template <typename T>
+class MutableArrayRef;
+template <typename T>
+class Optional;
+template <typename... PT>
+class PointerUnion;
+template <typename T, typename Vector, typename Set>
+class SetVector;
+template <typename T, unsigned N>
+class SmallPtrSet;
+template <typename T>
+class SmallPtrSetImpl;
+template <typename T, unsigned N>
+class SmallVector;
+template <typename T>
+class SmallVectorImpl;
+template <typename AllocatorTy>
+class StringSet;
+template <typename T, typename R>
+class StringSwitch;
+template <typename T>
+class TinyPtrVector;
+template <typename T, typename ResultT>
+class TypeSwitch;
// Other common classes.
class APInt;
class APSInt;
class APFloat;
-template <typename Fn> class function_ref;
-template <typename IteratorT> class iterator_range;
+template <typename Fn>
+class function_ref;
+template <typename IteratorT>
+class iterator_range;
class raw_ostream;
class SMLoc;
class SMRange;
@@ -126,7 +145,8 @@ using TypeSwitch = llvm::TypeSwitch<T, ResultT>;
using llvm::APFloat;
using llvm::APInt;
using llvm::APSInt;
-template <typename Fn> using function_ref = llvm::function_ref<Fn>;
+template <typename Fn>
+using function_ref = llvm::function_ref<Fn>;
using llvm::iterator_range;
using llvm::raw_ostream;
using llvm::SMLoc;
diff --git a/mlir/include/mlir/Support/LogicalResult.h b/mlir/include/mlir/Support/LogicalResult.h
index b2cf736fef9b6..5a1462aadc6ea 100644
--- a/mlir/include/mlir/Support/LogicalResult.h
+++ b/mlir/include/mlir/Support/LogicalResult.h
@@ -74,7 +74,8 @@ inline bool failed(LogicalResult result) { return result.failed(); }
/// This class provides support for representing a failure result, or a valid
/// value of type `T`. This allows for integrating with LogicalResult, while
/// also providing a value on the success path.
-template <typename T> class LLVM_NODISCARD FailureOr : public Optional<T> {
+template <typename T>
+class LLVM_NODISCARD FailureOr : public Optional<T> {
public:
/// Allow constructing from a LogicalResult. The result *must* be a failure.
/// Success results should use a proper instance of type `T`.
diff --git a/mlir/include/mlir/Support/StorageUniquer.h b/mlir/include/mlir/Support/StorageUniquer.h
index 122bad1cdedc6..f0ea28c743ee9 100644
--- a/mlir/include/mlir/Support/StorageUniquer.h
+++ b/mlir/include/mlir/Support/StorageUniquer.h
@@ -94,7 +94,8 @@ class StorageUniquer {
public:
/// Copy the specified array of elements into memory managed by our bump
/// pointer allocator. This assumes the elements are all PODs.
- template <typename T> ArrayRef<T> copyInto(ArrayRef<T> elements) {
+ template <typename T>
+ ArrayRef<T> copyInto(ArrayRef<T> elements) {
if (elements.empty())
return llvm::None;
auto result = allocator.Allocate<T>(elements.size());
@@ -115,7 +116,10 @@ class StorageUniquer {
}
/// Allocate an instance of the provided type.
- template <typename T> T *allocate() { return allocator.Allocate<T>(); }
+ template <typename T>
+ T *allocate() {
+ return allocator.Allocate<T>();
+ }
/// Allocate 'size' bytes of 'alignment' aligned memory.
void *allocate(size_t size, size_t alignment) {
@@ -141,7 +145,8 @@ class StorageUniquer {
/// Register a new parametric storage class, this is necessary to create
/// instances of this class type. `id` is the type identifier that will be
/// used to identify this type when creating instances of it via 'get'.
- template <typename Storage> void registerParametricStorageType(TypeID id) {
+ template <typename Storage>
+ void registerParametricStorageType(TypeID id) {
// If the storage is trivially destructible, we don't need a destructor
// function.
if (std::is_trivially_destructible<Storage>::value)
@@ -151,7 +156,8 @@ class StorageUniquer {
});
}
/// Utility override when the storage type represents the type id.
- template <typename Storage> void registerParametricStorageType() {
+ template <typename Storage>
+ void registerParametricStorageType() {
registerParametricStorageType<Storage>(TypeID::get<Storage>());
}
/// Register a new singleton storage class, this is necessary to get the
@@ -170,7 +176,8 @@ class StorageUniquer {
};
registerSingletonImpl(id, ctorFn);
}
- template <typename Storage> void registerSingletonStorageType(TypeID id) {
+ template <typename Storage>
+ void registerSingletonStorageType(TypeID id) {
registerSingletonStorageType<Storage>(id, llvm::None);
}
/// Utility override when the storage type represents the type id.
@@ -219,11 +226,13 @@ class StorageUniquer {
/// Gets a uniqued instance of 'Storage' which is a singleton storage type.
/// 'id' is the type id used when registering the storage instance.
- template <typename Storage> Storage *get(TypeID id) {
+ template <typename Storage>
+ Storage *get(TypeID id) {
return static_cast<Storage *>(getSingletonImpl(id));
}
/// Utility override when the storage type represents the type id.
- template <typename Storage> Storage *get() {
+ template <typename Storage>
+ Storage *get() {
return get<Storage>(TypeID::get<Storage>());
}
diff --git a/mlir/include/mlir/Support/TypeID.h b/mlir/include/mlir/Support/TypeID.h
index 433ab12e539a1..f27f73fb19928 100644
--- a/mlir/include/mlir/Support/TypeID.h
+++ b/mlir/include/mlir/Support/TypeID.h
@@ -334,7 +334,8 @@ class alignas(8) SelfOwningTypeID {
MLIR_DECLARE_EXPLICIT_TYPE_ID(void)
namespace llvm {
-template <> struct DenseMapInfo<mlir::TypeID> {
+template <>
+struct DenseMapInfo<mlir::TypeID> {
static inline mlir::TypeID getEmptyKey() {
void *pointer = llvm::DenseMapInfo<void *>::getEmptyKey();
return mlir::TypeID::getFromOpaquePointer(pointer);
@@ -350,7 +351,8 @@ template <> struct DenseMapInfo<mlir::TypeID> {
};
/// We align TypeID::Storage by 8, so allow LLVM to steal the low bits.
-template <> struct PointerLikeTypeTraits<mlir::TypeID> {
+template <>
+struct PointerLikeTypeTraits<mlir::TypeID> {
static inline void *getAsVoidPointer(mlir::TypeID info) {
return const_cast<void *>(info.getAsOpaquePointer());
}
diff --git a/mlir/include/mlir/TableGen/CodeGenHelpers.h b/mlir/include/mlir/TableGen/CodeGenHelpers.h
index 3f55e3b374f45..ecde28f73138e 100644
--- a/mlir/include/mlir/TableGen/CodeGenHelpers.h
+++ b/mlir/include/mlir/TableGen/CodeGenHelpers.h
@@ -216,15 +216,16 @@ class StaticVerifierFunctionEmitter {
std::string escapeString(StringRef value);
namespace detail {
-template <typename> struct stringifier {
- template <typename T> static std::string apply(T &&t) {
+template <typename>
+struct stringifier {
+ template <typename T>
+ static std::string apply(T &&t) {
return std::string(std::forward<T>(t));
}
};
-template <> struct stringifier<Twine> {
- static std::string apply(const Twine &twine) {
- return twine.str();
- }
+template <>
+struct stringifier<Twine> {
+ static std::string apply(const Twine &twine) { return twine.str(); }
};
template <typename OptionalT>
struct stringifier<Optional<OptionalT>> {
@@ -235,7 +236,8 @@ struct stringifier<Optional<OptionalT>> {
} // namespace detail
/// Generically convert a value to a std::string.
-template <typename T> std::string stringify(T &&t) {
+template <typename T>
+std::string stringify(T &&t) {
return detail::stringifier<std::remove_reference_t<std::remove_const_t<T>>>::
apply(std::forward<T>(t));
}
diff --git a/mlir/include/mlir/TableGen/Format.h b/mlir/include/mlir/TableGen/Format.h
index 726a8416d03ed..d2483b358c871 100644
--- a/mlir/include/mlir/TableGen/Format.h
+++ b/mlir/include/mlir/TableGen/Format.h
@@ -165,19 +165,24 @@ class FmtObjectBase {
return s.str();
}
- template <unsigned N> SmallString<N> sstr() const {
+ template <unsigned N>
+ SmallString<N> sstr() const {
SmallString<N> result;
llvm::raw_svector_ostream s(result);
format(s);
return result;
}
- template <unsigned N> operator SmallString<N>() const { return sstr<N>(); }
+ template <unsigned N>
+ operator SmallString<N>() const {
+ return sstr<N>();
+ }
operator std::string() const { return str(); }
};
-template <typename Tuple> class FmtObject : public FmtObjectBase {
+template <typename Tuple>
+class FmtObject : public FmtObjectBase {
// Storage for the parameter adapters. Since the base class erases the type
// of the parameters, we have to own the storage for the parameters here, and
// have the base class store type-erased pointers into this tuple.
diff --git a/mlir/include/mlir/Tools/PDLL/AST/Nodes.h b/mlir/include/mlir/Tools/PDLL/AST/Nodes.h
index 2e947b1106adc..716b2be9f51ff 100644
--- a/mlir/include/mlir/Tools/PDLL/AST/Nodes.h
+++ b/mlir/include/mlir/Tools/PDLL/AST/Nodes.h
@@ -34,8 +34,7 @@ class VariableDecl;
/// This class provides a convenient API for interacting with source names. It
/// contains a string name as well as the source location for that name.
struct Name {
- static const Name &create(Context &ctx, StringRef name,
- SMRange location);
+ static const Name &create(Context &ctx, StringRef name, SMRange location);
/// Return the raw string name.
StringRef getName() const { return name; }
@@ -47,8 +46,7 @@ struct Name {
Name() = delete;
Name(const Name &) = delete;
Name &operator=(const Name &) = delete;
- Name(StringRef name, SMRange location)
- : name(name), location(location) {}
+ Name(StringRef name, SMRange location) : name(name), location(location) {}
/// The string name of the decl.
StringRef name;
@@ -80,13 +78,15 @@ class DeclScope {
/// Lookup a decl with the given name starting from this scope. Returns
/// nullptr if no decl could be found.
Decl *lookup(StringRef name);
- template <typename T> T *lookup(StringRef name) {
+ template <typename T>
+ T *lookup(StringRef name) {
return dyn_cast_or_null<T>(lookup(name));
}
const Decl *lookup(StringRef name) const {
return const_cast<DeclScope *>(this)->lookup(name);
}
- template <typename T> const T *lookup(StringRef name) const {
+ template <typename T>
+ const T *lookup(StringRef name) const {
return dyn_cast_or_null<T>(lookup(name));
}
@@ -107,7 +107,8 @@ class DeclScope {
class Node {
public:
/// This CRTP class provides several utilies when defining new AST nodes.
- template <typename T, typename BaseT> class NodeBase : public BaseT {
+ template <typename T, typename BaseT>
+ class NodeBase : public BaseT {
public:
using Base = NodeBase<T, BaseT>;
@@ -208,15 +209,13 @@ class CompoundStmt final : public Node::NodeBase<CompoundStmt, Stmt>,
/// to define variables.
class LetStmt final : public Node::NodeBase<LetStmt, Stmt> {
public:
- static LetStmt *create(Context &ctx, SMRange loc,
- VariableDecl *varDecl);
+ static LetStmt *create(Context &ctx, SMRange loc, VariableDecl *varDecl);
/// Return the variable defined by this statement.
VariableDecl *getVarDecl() const { return varDecl; }
private:
- LetStmt(SMRange loc, VariableDecl *varDecl)
- : Base(loc), varDecl(varDecl) {}
+ LetStmt(SMRange loc, VariableDecl *varDecl) : Base(loc), varDecl(varDecl) {}
/// The variable defined by this statement.
VariableDecl *varDecl;
@@ -351,8 +350,7 @@ class Expr : public Stmt {
static bool classof(const Node *node);
protected:
- Expr(TypeID typeID, SMRange loc, Type type)
- : Stmt(typeID, loc), type(type) {}
+ Expr(TypeID typeID, SMRange loc, Type type) : Stmt(typeID, loc), type(type) {}
private:
/// The type of this expression.
@@ -367,8 +365,7 @@ class Expr : public Stmt {
/// textual assembly format of that attribute.
class AttributeExpr : public Node::NodeBase<AttributeExpr, Expr> {
public:
- static AttributeExpr *create(Context &ctx, SMRange loc,
- StringRef value);
+ static AttributeExpr *create(Context &ctx, SMRange loc, StringRef value);
/// Get the raw value of this expression. This is the textual assembly format
/// of the MLIR Attribute.
@@ -426,8 +423,7 @@ class CallExpr final : public Node::NodeBase<CallExpr, Expr>,
/// This expression represents a reference to a Decl node.
class DeclRefExpr : public Node::NodeBase<DeclRefExpr, Expr> {
public:
- static DeclRefExpr *create(Context &ctx, SMRange loc, Decl *decl,
- Type type);
+ static DeclRefExpr *create(Context &ctx, SMRange loc, Decl *decl, Type type);
/// Get the decl referenced by this expression.
Decl *getDecl() const { return decl; }
@@ -459,8 +455,8 @@ class MemberAccessExpr : public Node::NodeBase<MemberAccessExpr, Expr> {
StringRef getMemberName() const { return memberName; }
private:
- MemberAccessExpr(SMRange loc, const Expr *parentExpr,
- StringRef memberName, Type type)
+ MemberAccessExpr(SMRange loc, const Expr *parentExpr, StringRef memberName,
+ Type type)
: Base(loc, type), parentExpr(parentExpr), memberName(memberName) {}
/// The parent expression of this access.
@@ -578,8 +574,7 @@ class OperationExpr final
class TupleExpr final : public Node::NodeBase<TupleExpr, Expr>,
private llvm::TrailingObjects<TupleExpr, Expr *> {
public:
- static TupleExpr *create(Context &ctx, SMRange loc,
- ArrayRef<Expr *> elements,
+ static TupleExpr *create(Context &ctx, SMRange loc, ArrayRef<Expr *> elements,
ArrayRef<StringRef> elementNames);
/// Return the element expressions of this tuple.
@@ -697,8 +692,7 @@ class CoreConstraintDecl : public ConstraintDecl {
static bool classof(const Node *node);
protected:
- CoreConstraintDecl(TypeID typeID, SMRange loc,
- const Name *name = nullptr)
+ CoreConstraintDecl(TypeID typeID, SMRange loc, const Name *name = nullptr)
: ConstraintDecl(typeID, loc, name) {}
};
@@ -786,8 +780,7 @@ class TypeRangeConstraintDecl
class ValueConstraintDecl
: public Node::NodeBase<ValueConstraintDecl, CoreConstraintDecl> {
public:
- static ValueConstraintDecl *create(Context &ctx, SMRange loc,
- Expr *typeExpr);
+ static ValueConstraintDecl *create(Context &ctx, SMRange loc, Expr *typeExpr);
/// Return the optional type the value is constrained to.
Expr *getTypeExpr() { return typeExpr; }
@@ -996,8 +989,8 @@ class OpNameDecl : public Node::NodeBase<OpNameDecl, Decl> {
/// This Decl represents a single Pattern.
class PatternDecl : public Node::NodeBase<PatternDecl, Decl> {
public:
- static PatternDecl *create(Context &ctx, SMRange location,
- const Name *name, Optional<uint16_t> benefit,
+ static PatternDecl *create(Context &ctx, SMRange location, const Name *name,
+ Optional<uint16_t> benefit,
bool hasBoundedRecursion,
const CompoundStmt *body);
@@ -1249,8 +1242,7 @@ class VariableDecl final
class Module final : public Node::NodeBase<Module, Node>,
private llvm::TrailingObjects<Module, Decl *> {
public:
- static Module *create(Context &ctx, SMLoc loc,
- ArrayRef<Decl *> children);
+ static Module *create(Context &ctx, SMLoc loc, ArrayRef<Decl *> children);
/// Return the children of this module.
MutableArrayRef<Decl *> getChildren() {
diff --git a/mlir/include/mlir/Tools/PDLL/AST/Types.h b/mlir/include/mlir/Tools/PDLL/AST/Types.h
index a4c0888441e2c..894e1fbb0da06 100644
--- a/mlir/include/mlir/Tools/PDLL/AST/Types.h
+++ b/mlir/include/mlir/Tools/PDLL/AST/Types.h
@@ -62,20 +62,25 @@ class Type {
explicit operator bool() const { return impl; }
/// Provide type casting support.
- template <typename U> bool isa() const {
+ template <typename U>
+ bool isa() const {
assert(impl && "isa<> used on a null type.");
return U::classof(*this);
}
- template <typename U, typename V, typename... Others> bool isa() const {
+ template <typename U, typename V, typename... Others>
+ bool isa() const {
return isa<U>() || isa<V, Others...>();
}
- template <typename U> U dyn_cast() const {
+ template <typename U>
+ U dyn_cast() const {
return isa<U>() ? U(impl) : U(nullptr);
}
- template <typename U> U dyn_cast_or_null() const {
+ template <typename U>
+ U dyn_cast_or_null() const {
return (impl && isa<U>()) ? U(impl) : U(nullptr);
}
- template <typename U> U cast() const {
+ template <typename U>
+ U cast() const {
assert(isa<U>());
return U(impl);
}
@@ -99,7 +104,8 @@ class Type {
protected:
/// Return the internal storage instance of this type reinterpreted as the
/// given derived storage type.
- template <typename T> const T *getImplAs() const {
+ template <typename T>
+ const T *getImplAs() const {
return static_cast<const T *>(impl);
}
@@ -296,7 +302,8 @@ MLIR_DECLARE_EXPLICIT_TYPE_ID(mlir::pdll::ast::detail::TypeTypeStorage)
MLIR_DECLARE_EXPLICIT_TYPE_ID(mlir::pdll::ast::detail::ValueTypeStorage)
namespace llvm {
-template <> struct DenseMapInfo<mlir::pdll::ast::Type> {
+template <>
+struct DenseMapInfo<mlir::pdll::ast::Type> {
static mlir::pdll::ast::Type getEmptyKey() {
void *pointer = llvm::DenseMapInfo<void *>::getEmptyKey();
return mlir::pdll::ast::Type(
diff --git a/mlir/include/mlir/Transforms/FoldUtils.h b/mlir/include/mlir/Transforms/FoldUtils.h
index d323472ba49ac..11ff8b30f5b99 100644
--- a/mlir/include/mlir/Transforms/FoldUtils.h
+++ b/mlir/include/mlir/Transforms/FoldUtils.h
@@ -67,7 +67,7 @@ class OperationFolder {
/// the results after folding the operation.
template <typename OpTy, typename... Args>
void create(OpBuilder &builder, SmallVectorImpl<Value> &results,
- Location location, Args &&... args) {
+ Location location, Args &&...args) {
// The op needs to be inserted only if the fold (below) fails, or the number
// of results produced by the successful folding is zero (which is treated
// as an in-place fold). Using create methods of the builder will insert the
@@ -88,7 +88,7 @@ class OperationFolder {
template <typename OpTy, typename... Args>
typename std::enable_if<OpTy::template hasTrait<OpTrait::OneResult>(),
Value>::type
- create(OpBuilder &builder, Location location, Args &&... args) {
+ create(OpBuilder &builder, Location location, Args &&...args) {
SmallVector<Value, 1> results;
create<OpTy>(builder, results, location, std::forward<Args>(args)...);
return results.front();
@@ -98,7 +98,7 @@ class OperationFolder {
template <typename OpTy, typename... Args>
typename std::enable_if<OpTy::template hasTrait<OpTrait::ZeroResults>(),
OpTy>::type
- create(OpBuilder &builder, Location location, Args &&... args) {
+ create(OpBuilder &builder, Location location, Args &&...args) {
auto op = builder.create<OpTy>(location, std::forward<Args>(args)...);
SmallVector<Value, 0> unused;
(void)tryToFold(op.getOperation(), unused);
diff --git a/mlir/include/mlir/Transforms/ViewOpGraph.h b/mlir/include/mlir/Transforms/ViewOpGraph.h
index 9fd2fe2fbefe6..ab52ec7646211 100644
--- a/mlir/include/mlir/Transforms/ViewOpGraph.h
+++ b/mlir/include/mlir/Transforms/ViewOpGraph.h
@@ -20,8 +20,7 @@ namespace mlir {
class Pass;
/// Creates a pass to print op graphs.
-std::unique_ptr<Pass>
-createPrintOpGraphPass(raw_ostream &os = llvm::errs());
+std::unique_ptr<Pass> createPrintOpGraphPass(raw_ostream &os = llvm::errs());
} // namespace mlir
diff --git a/mlir/lib/Conversion/BufferizationToMemRef/BufferizationToMemRef.cpp b/mlir/lib/Conversion/BufferizationToMemRef/BufferizationToMemRef.cpp
index 0be43b9ec7a6e..d98bb2a233358 100644
--- a/mlir/lib/Conversion/BufferizationToMemRef/BufferizationToMemRef.cpp
+++ b/mlir/lib/Conversion/BufferizationToMemRef/BufferizationToMemRef.cpp
@@ -11,8 +11,8 @@
//
//===----------------------------------------------------------------------===//
-#include "../PassDetail.h"
#include "mlir/Conversion/BufferizationToMemRef/BufferizationToMemRef.h"
+#include "../PassDetail.h"
#include "mlir/Dialect/Arithmetic/IR/Arithmetic.h"
#include "mlir/Dialect/Bufferization/IR/Bufferization.h"
#include "mlir/Dialect/MemRef/IR/MemRef.h"
diff --git a/mlir/lib/Conversion/ComplexToStandard/ComplexToStandard.cpp b/mlir/lib/Conversion/ComplexToStandard/ComplexToStandard.cpp
index b104826b757fa..9e9ba52e70aa5 100644
--- a/mlir/lib/Conversion/ComplexToStandard/ComplexToStandard.cpp
+++ b/mlir/lib/Conversion/ComplexToStandard/ComplexToStandard.cpp
@@ -766,8 +766,8 @@ struct SqrtOpConversion : public OpConversionPattern<complex::SqrtOp> {
Value absArg = b.create<complex::AbsOp>(elementType, arg);
Value addAbs = b.create<arith::AddFOp>(absLhs, absArg);
- Value half = b.create<arith::ConstantOp>(
- elementType, b.getFloatAttr(elementType, 0.5));
+ Value half = b.create<arith::ConstantOp>(elementType,
+ b.getFloatAttr(elementType, 0.5));
Value halfAddAbs = b.create<arith::MulFOp>(addAbs, half);
Value sqrtAddAbs = b.create<math::SqrtOp>(halfAddAbs);
diff --git a/mlir/lib/Conversion/GPUCommon/GPUToLLVMConversion.cpp b/mlir/lib/Conversion/GPUCommon/GPUToLLVMConversion.cpp
index 26fed8c1691e9..529efab558928 100644
--- a/mlir/lib/Conversion/GPUCommon/GPUToLLVMConversion.cpp
+++ b/mlir/lib/Conversion/GPUCommon/GPUToLLVMConversion.cpp
@@ -877,9 +877,9 @@ mlir::createGpuToLLVMConversionPass() {
return std::make_unique<GpuToLLVMConversionPass>();
}
-void mlir::populateGpuToLLVMConversionPatterns(
- LLVMTypeConverter &converter, RewritePatternSet &patterns,
- StringRef gpuBinaryAnnotation) {
+void mlir::populateGpuToLLVMConversionPatterns(LLVMTypeConverter &converter,
+ RewritePatternSet &patterns,
+ StringRef gpuBinaryAnnotation) {
converter.addConversion(
[context = &converter.getContext()](gpu::AsyncTokenType type) -> Type {
return LLVM::LLVMPointerType::get(IntegerType::get(context, 8));
diff --git a/mlir/lib/Conversion/LinalgToSPIRV/LinalgToSPIRV.cpp b/mlir/lib/Conversion/LinalgToSPIRV/LinalgToSPIRV.cpp
index c50c942cac546..2e52122d94d55 100644
--- a/mlir/lib/Conversion/LinalgToSPIRV/LinalgToSPIRV.cpp
+++ b/mlir/lib/Conversion/LinalgToSPIRV/LinalgToSPIRV.cpp
@@ -146,7 +146,6 @@ LogicalResult SingleWorkgroupReduction::matchAndRewrite(
// TODO: Load to Workgroup storage class first.
-
// Get the input element accessed by this invocation.
Value inputElementPtr = spirv::getElementPtr(
*typeConverter, originalInputType, convertedInput, {x}, loc, rewriter);
diff --git a/mlir/lib/Conversion/LinalgToStandard/LinalgToStandard.cpp b/mlir/lib/Conversion/LinalgToStandard/LinalgToStandard.cpp
index 95307737e9c1d..2779d247ddf14 100644
--- a/mlir/lib/Conversion/LinalgToStandard/LinalgToStandard.cpp
+++ b/mlir/lib/Conversion/LinalgToStandard/LinalgToStandard.cpp
@@ -111,7 +111,6 @@ LogicalResult mlir::linalg::LinalgOpToLibraryCallRewrite::matchAndRewrite(
return success();
}
-
/// Populate the given list with patterns that convert from Linalg to Standard.
void mlir::linalg::populateLinalgToStandardConversionPatterns(
RewritePatternSet &patterns) {
diff --git a/mlir/lib/Dialect/Affine/IR/AffineOps.cpp b/mlir/lib/Dialect/Affine/IR/AffineOps.cpp
index 8a497d7936fc8..d2dc66d610789 100644
--- a/mlir/lib/Dialect/Affine/IR/AffineOps.cpp
+++ b/mlir/lib/Dialect/Affine/IR/AffineOps.cpp
@@ -2753,7 +2753,8 @@ LogicalResult AffineStoreOp::fold(ArrayRef<Attribute> cstOperands,
// AffineMinMaxOpBase
//===----------------------------------------------------------------------===//
-template <typename T> static LogicalResult verifyAffineMinMaxOp(T op) {
+template <typename T>
+static LogicalResult verifyAffineMinMaxOp(T op) {
// Verify that operand count matches affine map dimension and symbol count.
if (op.getNumOperands() !=
op.getMap().getNumDims() + op.getMap().getNumSymbols())
@@ -2762,7 +2763,8 @@ template <typename T> static LogicalResult verifyAffineMinMaxOp(T op) {
return success();
}
-template <typename T> static void printAffineMinMaxOp(OpAsmPrinter &p, T op) {
+template <typename T>
+static void printAffineMinMaxOp(OpAsmPrinter &p, T op) {
p << ' ' << op->getAttr(T::getMapAttrStrName());
auto operands = op.getOperands();
unsigned numDims = op.getMap().getNumDims();
@@ -2870,7 +2872,8 @@ struct DeduplicateAffineMinMaxExpressions : public OpRewritePattern<T> {
///
/// %1 = affine.min affine_map<
/// ()[s0, s1] -> (s0 + 4, s1 + 16, s1 * 8)> ()[%sym2, %sym1]
-template <typename T> struct MergeAffineMinMaxOp : public OpRewritePattern<T> {
+template <typename T>
+struct MergeAffineMinMaxOp : public OpRewritePattern<T> {
using OpRewritePattern<T>::OpRewritePattern;
LogicalResult matchAndRewrite(T affineOp,
diff --git a/mlir/lib/Dialect/Arithmetic/IR/ArithmeticOps.cpp b/mlir/lib/Dialect/Arithmetic/IR/ArithmeticOps.cpp
index 672df0c9947e8..f9f4c686a0503 100644
--- a/mlir/lib/Dialect/Arithmetic/IR/ArithmeticOps.cpp
+++ b/mlir/lib/Dialect/Arithmetic/IR/ArithmeticOps.cpp
@@ -209,8 +209,8 @@ OpFoldResult arith::AddIOp::fold(ArrayRef<Attribute> operands) {
operands, [](APInt a, const APInt &b) { return std::move(a) + b; });
}
-void arith::AddIOp::getCanonicalizationPatterns(
- RewritePatternSet &patterns, MLIRContext *context) {
+void arith::AddIOp::getCanonicalizationPatterns(RewritePatternSet &patterns,
+ MLIRContext *context) {
patterns.add<AddIAddConstant, AddISubConstantRHS, AddISubConstantLHS>(
context);
}
@@ -231,8 +231,8 @@ OpFoldResult arith::SubIOp::fold(ArrayRef<Attribute> operands) {
operands, [](APInt a, const APInt &b) { return std::move(a) - b; });
}
-void arith::SubIOp::getCanonicalizationPatterns(
- RewritePatternSet &patterns, MLIRContext *context) {
+void arith::SubIOp::getCanonicalizationPatterns(RewritePatternSet &patterns,
+ MLIRContext *context) {
patterns
.add<SubIRHSAddConstant, SubILHSAddConstant, SubIRHSSubConstantRHS,
SubIRHSSubConstantLHS, SubILHSSubConstantRHS, SubILHSSubConstantLHS>(
@@ -539,8 +539,8 @@ OpFoldResult arith::XOrIOp::fold(ArrayRef<Attribute> operands) {
operands, [](APInt a, const APInt &b) { return std::move(a) ^ b; });
}
-void arith::XOrIOp::getCanonicalizationPatterns(
- RewritePatternSet &patterns, MLIRContext *context) {
+void arith::XOrIOp::getCanonicalizationPatterns(RewritePatternSet &patterns,
+ MLIRContext *context) {
patterns.add<XOrINotCmpI>(context);
}
@@ -921,8 +921,8 @@ bool arith::ExtSIOp::areCastCompatible(TypeRange inputs, TypeRange outputs) {
return checkWidthChangeCast<std::greater, IntegerType>(inputs, outputs);
}
-void arith::ExtSIOp::getCanonicalizationPatterns(
- RewritePatternSet &patterns, MLIRContext *context) {
+void arith::ExtSIOp::getCanonicalizationPatterns(RewritePatternSet &patterns,
+ MLIRContext *context) {
patterns.add<ExtSIOfExtUI>(context);
}
@@ -1017,8 +1017,8 @@ LogicalResult arith::TruncFOp::verify() {
// AndIOp
//===----------------------------------------------------------------------===//
-void arith::AndIOp::getCanonicalizationPatterns(
- RewritePatternSet &patterns, MLIRContext *context) {
+void arith::AndIOp::getCanonicalizationPatterns(RewritePatternSet &patterns,
+ MLIRContext *context) {
patterns.add<AndOfExtUI, AndOfExtSI>(context);
}
@@ -1026,8 +1026,8 @@ void arith::AndIOp::getCanonicalizationPatterns(
// OrIOp
//===----------------------------------------------------------------------===//
-void arith::OrIOp::getCanonicalizationPatterns(
- RewritePatternSet &patterns, MLIRContext *context) {
+void arith::OrIOp::getCanonicalizationPatterns(RewritePatternSet &patterns,
+ MLIRContext *context) {
patterns.add<OrOfExtUI, OrOfExtSI>(context);
}
@@ -1226,8 +1226,8 @@ OpFoldResult arith::BitcastOp::fold(ArrayRef<Attribute> operands) {
return IntegerAttr::get(resType, bits);
}
-void arith::BitcastOp::getCanonicalizationPatterns(
- RewritePatternSet &patterns, MLIRContext *context) {
+void arith::BitcastOp::getCanonicalizationPatterns(RewritePatternSet &patterns,
+ MLIRContext *context) {
patterns.add<BitcastOfBitcast>(context);
}
diff --git a/mlir/lib/Dialect/Arithmetic/Transforms/ExpandOps.cpp b/mlir/lib/Dialect/Arithmetic/Transforms/ExpandOps.cpp
index b4bff0f2de95f..afe7aab99af30 100644
--- a/mlir/lib/Dialect/Arithmetic/Transforms/ExpandOps.cpp
+++ b/mlir/lib/Dialect/Arithmetic/Transforms/ExpandOps.cpp
@@ -159,7 +159,7 @@ struct MaxMinFOpConverter : public OpRewritePattern<OpTy> {
Location loc = op.getLoc();
// If any operand is NaN, 'cmp' will be true (and 'select' returns 'lhs').
static_assert(pred == arith::CmpFPredicate::UGT ||
- pred == arith::CmpFPredicate::ULT,
+ pred == arith::CmpFPredicate::ULT,
"pred must be either UGT or ULT");
Value cmp = rewriter.create<arith::CmpFOp>(loc, pred, lhs, rhs);
Value select = rewriter.create<arith::SelectOp>(loc, cmp, lhs, rhs);
diff --git a/mlir/lib/Dialect/Bufferization/Transforms/Bufferize.cpp b/mlir/lib/Dialect/Bufferization/Transforms/Bufferize.cpp
index f1dfbd113947a..10c6d6e65de5d 100644
--- a/mlir/lib/Dialect/Bufferization/Transforms/Bufferize.cpp
+++ b/mlir/lib/Dialect/Bufferization/Transforms/Bufferize.cpp
@@ -212,15 +212,14 @@ struct OneShotBufferizePass
};
// Configure op filter.
- OpFilter::Entry::FilterFn filterFn =
- [&](Operation *op) {
- // Filter may be specified via options.
- if (this->dialectFilter.hasValue())
- return llvm::is_contained(this->dialectFilter,
- op->getDialect()->getNamespace());
- // No filter specified: All other ops are allowed.
- return true;
- };
+ OpFilter::Entry::FilterFn filterFn = [&](Operation *op) {
+ // Filter may be specified via options.
+ if (this->dialectFilter.hasValue())
+ return llvm::is_contained(this->dialectFilter,
+ op->getDialect()->getNamespace());
+ // No filter specified: All other ops are allowed.
+ return true;
+ };
opt.opFilter.allowOperation(filterFn);
} else {
opt = *options;
diff --git a/mlir/lib/Dialect/GPU/Transforms/SerializeToCubin.cpp b/mlir/lib/Dialect/GPU/Transforms/SerializeToCubin.cpp
index b33db153c6447..e1b1e7e93d658 100644
--- a/mlir/lib/Dialect/GPU/Transforms/SerializeToCubin.cpp
+++ b/mlir/lib/Dialect/GPU/Transforms/SerializeToCubin.cpp
@@ -133,16 +133,15 @@ SerializeToCubinPass::serializeISA(const std::string &isa) {
// Register pass to serialize GPU kernel functions to a CUBIN binary annotation.
void mlir::registerGpuSerializeToCubinPass() {
- PassRegistration<SerializeToCubinPass> registerSerializeToCubin(
- [] {
- // Initialize LLVM NVPTX backend.
- LLVMInitializeNVPTXTarget();
- LLVMInitializeNVPTXTargetInfo();
- LLVMInitializeNVPTXTargetMC();
- LLVMInitializeNVPTXAsmPrinter();
-
- return std::make_unique<SerializeToCubinPass>();
- });
+ PassRegistration<SerializeToCubinPass> registerSerializeToCubin([] {
+ // Initialize LLVM NVPTX backend.
+ LLVMInitializeNVPTXTarget();
+ LLVMInitializeNVPTXTargetInfo();
+ LLVMInitializeNVPTXTargetMC();
+ LLVMInitializeNVPTXAsmPrinter();
+
+ return std::make_unique<SerializeToCubinPass>();
+ });
}
#else // MLIR_GPU_TO_CUBIN_PASS_ENABLE
void mlir::registerGpuSerializeToCubinPass() {}
diff --git a/mlir/lib/Dialect/GPU/Transforms/SerializeToHsaco.cpp b/mlir/lib/Dialect/GPU/Transforms/SerializeToHsaco.cpp
index 2b0a8ac267101..eb33071dc1ae7 100644
--- a/mlir/lib/Dialect/GPU/Transforms/SerializeToHsaco.cpp
+++ b/mlir/lib/Dialect/GPU/Transforms/SerializeToHsaco.cpp
@@ -360,8 +360,7 @@ SerializeToHsacoPass::assembleIsa(const std::string &isa) {
}
llvm::SourceMgr srcMgr;
- srcMgr.AddNewSourceBuffer(llvm::MemoryBuffer::getMemBuffer(isa),
- SMLoc());
+ srcMgr.AddNewSourceBuffer(llvm::MemoryBuffer::getMemBuffer(isa), SMLoc());
const llvm::MCTargetOptions mcOptions;
std::unique_ptr<llvm::MCRegisterInfo> mri(
@@ -469,18 +468,17 @@ SerializeToHsacoPass::serializeISA(const std::string &isa) {
// Register pass to serialize GPU kernel functions to a HSACO binary annotation.
void mlir::registerGpuSerializeToHsacoPass() {
- PassRegistration<SerializeToHsacoPass> registerSerializeToHSACO(
- [] {
- // Initialize LLVM AMDGPU backend.
- LLVMInitializeAMDGPUAsmParser();
- LLVMInitializeAMDGPUAsmPrinter();
- LLVMInitializeAMDGPUTarget();
- LLVMInitializeAMDGPUTargetInfo();
- LLVMInitializeAMDGPUTargetMC();
-
- return std::make_unique<SerializeToHsacoPass>("amdgcn-amd-amdhsa", "",
- "", 2);
- });
+ PassRegistration<SerializeToHsacoPass> registerSerializeToHSACO([] {
+ // Initialize LLVM AMDGPU backend.
+ LLVMInitializeAMDGPUAsmParser();
+ LLVMInitializeAMDGPUAsmPrinter();
+ LLVMInitializeAMDGPUTarget();
+ LLVMInitializeAMDGPUTargetInfo();
+ LLVMInitializeAMDGPUTargetMC();
+
+ return std::make_unique<SerializeToHsacoPass>("amdgcn-amd-amdhsa", "", "",
+ 2);
+ });
}
/// Create an instance of the GPU kernel function to HSAco binary serialization
diff --git a/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp b/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
index 965563af74157..ea3bfbabac132 100644
--- a/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
+++ b/mlir/lib/Dialect/LLVMIR/IR/LLVMDialect.cpp
@@ -485,7 +485,8 @@ recordStructIndices(Type baseGEPType, unsigned indexPos,
unsigned dynamicIndexPos = indexPos;
if (!isStaticIndex)
dynamicIndexPos = llvm::count(structIndices.take_front(indexPos + 1),
- LLVM::GEPOp::kDynamicIndex) - 1;
+ LLVM::GEPOp::kDynamicIndex) -
+ 1;
return llvm::TypeSwitch<Type, llvm::Error>(baseGEPType)
.Case<LLVMStructType>([&](LLVMStructType structType) -> llvm::Error {
diff --git a/mlir/lib/Dialect/LLVMIR/IR/LLVMTypeSyntax.cpp b/mlir/lib/Dialect/LLVMIR/IR/LLVMTypeSyntax.cpp
index 04015efea3e9f..52d798fe58cbb 100644
--- a/mlir/lib/Dialect/LLVMIR/IR/LLVMTypeSyntax.cpp
+++ b/mlir/lib/Dialect/LLVMIR/IR/LLVMTypeSyntax.cpp
@@ -311,8 +311,7 @@ static LLVMArrayType parseArrayType(AsmParser &parser) {
/// error at `subtypesLoc` in case of failure.
static LLVMStructType trySetStructBody(LLVMStructType type,
ArrayRef<Type> subtypes, bool isPacked,
- AsmParser &parser,
- SMLoc subtypesLoc) {
+ AsmParser &parser, SMLoc subtypesLoc) {
for (Type t : subtypes) {
if (!LLVMStructType::isValidElementType(t)) {
parser.emitError(subtypesLoc)
diff --git a/mlir/lib/Dialect/MemRef/Transforms/ComposeSubView.cpp b/mlir/lib/Dialect/MemRef/Transforms/ComposeSubView.cpp
index 5cad72de397c4..d5387c9faeffd 100644
--- a/mlir/lib/Dialect/MemRef/Transforms/ComposeSubView.cpp
+++ b/mlir/lib/Dialect/MemRef/Transforms/ComposeSubView.cpp
@@ -127,7 +127,7 @@ struct ComposeSubViewOpPattern : public OpRewritePattern<memref::SubViewOp> {
} // namespace
-void mlir::memref::populateComposeSubViewPatterns(
- RewritePatternSet &patterns, MLIRContext *context) {
+void mlir::memref::populateComposeSubViewPatterns(RewritePatternSet &patterns,
+ MLIRContext *context) {
patterns.add<ComposeSubViewOpPattern>(context);
}
diff --git a/mlir/lib/Dialect/SPIRV/IR/SPIRVDialect.cpp b/mlir/lib/Dialect/SPIRV/IR/SPIRVDialect.cpp
index 405ef8f52f29a..8621281ea0178 100644
--- a/mlir/lib/Dialect/SPIRV/IR/SPIRVDialect.cpp
+++ b/mlir/lib/Dialect/SPIRV/IR/SPIRVDialect.cpp
@@ -483,7 +483,8 @@ namespace {
// parseAndVerify does the actual parsing and verification of individual
// elements. This is a functor since parsing the last element of the list
// (termination condition) needs partial specialization.
-template <typename ParseType, typename... Args> struct ParseCommaSeparatedList {
+template <typename ParseType, typename... Args>
+struct ParseCommaSeparatedList {
Optional<std::tuple<ParseType, Args...>>
operator()(SPIRVDialect const &dialect, DialectAsmParser &parser) const {
auto parseVal = parseAndVerify<ParseType>(dialect, parser);
@@ -503,7 +504,8 @@ template <typename ParseType, typename... Args> struct ParseCommaSeparatedList {
// Partial specialization of the function to parse a comma separated list of
// specs to parse the last element of the list.
-template <typename ParseType> struct ParseCommaSeparatedList<ParseType> {
+template <typename ParseType>
+struct ParseCommaSeparatedList<ParseType> {
Optional<std::tuple<ParseType>> operator()(SPIRVDialect const &dialect,
DialectAsmParser &parser) const {
if (auto value = parseAndVerify<ParseType>(dialect, parser))
diff --git a/mlir/lib/Dialect/SPIRV/IR/SPIRVTypes.cpp b/mlir/lib/Dialect/SPIRV/IR/SPIRVTypes.cpp
index 494f32925315b..bf4582511f1a4 100644
--- a/mlir/lib/Dialect/SPIRV/IR/SPIRVTypes.cpp
+++ b/mlir/lib/Dialect/SPIRV/IR/SPIRVTypes.cpp
@@ -259,33 +259,42 @@ void CooperativeMatrixNVType::getCapabilities(
// ImageType
//===----------------------------------------------------------------------===//
-template <typename T> static constexpr unsigned getNumBits() { return 0; }
-template <> constexpr unsigned getNumBits<Dim>() {
+template <typename T>
+static constexpr unsigned getNumBits() {
+ return 0;
+}
+template <>
+constexpr unsigned getNumBits<Dim>() {
static_assert((1 << 3) > getMaxEnumValForDim(),
"Not enough bits to encode Dim value");
return 3;
}
-template <> constexpr unsigned getNumBits<ImageDepthInfo>() {
+template <>
+constexpr unsigned getNumBits<ImageDepthInfo>() {
static_assert((1 << 2) > getMaxEnumValForImageDepthInfo(),
"Not enough bits to encode ImageDepthInfo value");
return 2;
}
-template <> constexpr unsigned getNumBits<ImageArrayedInfo>() {
+template <>
+constexpr unsigned getNumBits<ImageArrayedInfo>() {
static_assert((1 << 1) > getMaxEnumValForImageArrayedInfo(),
"Not enough bits to encode ImageArrayedInfo value");
return 1;
}
-template <> constexpr unsigned getNumBits<ImageSamplingInfo>() {
+template <>
+constexpr unsigned getNumBits<ImageSamplingInfo>() {
static_assert((1 << 1) > getMaxEnumValForImageSamplingInfo(),
"Not enough bits to encode ImageSamplingInfo value");
return 1;
}
-template <> constexpr unsigned getNumBits<ImageSamplerUseInfo>() {
+template <>
+constexpr unsigned getNumBits<ImageSamplerUseInfo>() {
static_assert((1 << 2) > getMaxEnumValForImageSamplerUseInfo(),
"Not enough bits to encode ImageSamplerUseInfo value");
return 2;
}
-template <> constexpr unsigned getNumBits<ImageFormat>() {
+template <>
+constexpr unsigned getNumBits<ImageFormat>() {
static_assert((1 << 6) > getMaxEnumValForImageFormat(),
"Not enough bits to encode ImageFormat value");
return 6;
diff --git a/mlir/lib/IR/AffineExpr.cpp b/mlir/lib/IR/AffineExpr.cpp
index 5a19535a062fa..38d0e9b66dae1 100644
--- a/mlir/lib/IR/AffineExpr.cpp
+++ b/mlir/lib/IR/AffineExpr.cpp
@@ -8,8 +8,8 @@
#include <utility>
-#include "mlir/IR/AffineExpr.h"
#include "AffineExprDetail.h"
+#include "mlir/IR/AffineExpr.h"
#include "mlir/IR/AffineExprVisitor.h"
#include "mlir/IR/AffineMap.h"
#include "mlir/IR/IntegerSet.h"
diff --git a/mlir/lib/IR/AsmPrinter.cpp b/mlir/lib/IR/AsmPrinter.cpp
index 7865652d05722..2dc324f455bed 100644
--- a/mlir/lib/IR/AsmPrinter.cpp
+++ b/mlir/lib/IR/AsmPrinter.cpp
@@ -930,8 +930,7 @@ class SSANameState {
};
} // namespace
-SSANameState::SSANameState(
- Operation *op, const OpPrintingFlags &printerFlags)
+SSANameState::SSANameState(Operation *op, const OpPrintingFlags &printerFlags)
: printerFlags(printerFlags) {
llvm::SaveAndRestore<unsigned> valueIDSaver(nextValueID);
llvm::SaveAndRestore<unsigned> argumentIDSaver(nextArgumentID);
diff --git a/mlir/lib/IR/Block.cpp b/mlir/lib/IR/Block.cpp
index feb21493d0d38..18a79d25ff5bf 100644
--- a/mlir/lib/IR/Block.cpp
+++ b/mlir/lib/IR/Block.cpp
@@ -319,11 +319,11 @@ unsigned PredecessorIterator::getSuccessorIndex() const {
SuccessorRange::SuccessorRange() : SuccessorRange(nullptr, 0) {}
SuccessorRange::SuccessorRange(Block *block) : SuccessorRange() {
- if (block->empty() || llvm::hasSingleElement(*block->getParent()))
- return;
- Operation *term = &block->back();
- if ((count = term->getNumSuccessors()))
- base = term->getBlockOperands().data();
+ if (block->empty() || llvm::hasSingleElement(*block->getParent()))
+ return;
+ Operation *term = &block->back();
+ if ((count = term->getNumSuccessors()))
+ base = term->getBlockOperands().data();
}
SuccessorRange::SuccessorRange(Operation *term) : SuccessorRange() {
diff --git a/mlir/lib/IR/Diagnostics.cpp b/mlir/lib/IR/Diagnostics.cpp
index 98b9085f825a5..83bc50bfec974 100644
--- a/mlir/lib/IR/Diagnostics.cpp
+++ b/mlir/lib/IR/Diagnostics.cpp
@@ -373,8 +373,7 @@ struct SourceMgrDiagnosticHandlerImpl {
// Otherwise, try to load the source file.
std::string ignored;
- unsigned id =
- mgr.AddIncludeFile(std::string(filename), SMLoc(), ignored);
+ unsigned id = mgr.AddIncludeFile(std::string(filename), SMLoc(), ignored);
filenameToBufId[filename] = id;
return id;
}
diff --git a/mlir/lib/IR/FunctionInterfaces.cpp b/mlir/lib/IR/FunctionInterfaces.cpp
index dc3e08c8fdf05..3331aefc76d13 100644
--- a/mlir/lib/IR/FunctionInterfaces.cpp
+++ b/mlir/lib/IR/FunctionInterfaces.cpp
@@ -261,10 +261,8 @@ TypeRange mlir::function_interface_impl::insertTypesInto(
return storage;
}
-TypeRange
-mlir::function_interface_impl::filterTypesOut(TypeRange types,
- const BitVector &indices,
- SmallVectorImpl<Type> &storage) {
+TypeRange mlir::function_interface_impl::filterTypesOut(
+ TypeRange types, const BitVector &indices, SmallVectorImpl<Type> &storage) {
if (indices.none())
return types;
diff --git a/mlir/lib/IR/OperationSupport.cpp b/mlir/lib/IR/OperationSupport.cpp
index aaae4c8ad9da1..1f7a739cae50d 100644
--- a/mlir/lib/IR/OperationSupport.cpp
+++ b/mlir/lib/IR/OperationSupport.cpp
@@ -292,8 +292,7 @@ void detail::OperandStorage::eraseOperands(unsigned start, unsigned length) {
operands[numOperands + i].~OpOperand();
}
-void detail::OperandStorage::eraseOperands(
- const BitVector &eraseIndices) {
+void detail::OperandStorage::eraseOperands(const BitVector &eraseIndices) {
MutableArrayRef<OpOperand> operands = getOperands();
assert(eraseIndices.size() == operands.size());
diff --git a/mlir/lib/IR/Value.cpp b/mlir/lib/IR/Value.cpp
index ea730eb46422d..75976628e82a3 100644
--- a/mlir/lib/IR/Value.cpp
+++ b/mlir/lib/IR/Value.cpp
@@ -212,4 +212,3 @@ unsigned BlockOperand::getOperandNumber() {
unsigned OpOperand::getOperandNumber() {
return this - &getOwner()->getOpOperands()[0];
}
-
diff --git a/mlir/lib/Parser/AsmParserImpl.h b/mlir/lib/Parser/AsmParserImpl.h
index 7e204bc392c77..8f9c2b3f52a46 100644
--- a/mlir/lib/Parser/AsmParserImpl.h
+++ b/mlir/lib/Parser/AsmParserImpl.h
@@ -51,9 +51,7 @@ class AsmParserImpl : public BaseT {
/// Get the location of the next token and store it into the argument. This
/// always succeeds.
- SMLoc getCurrentLocation() override {
- return parser.getToken().getLoc();
- }
+ SMLoc getCurrentLocation() override { return parser.getToken().getLoc(); }
/// Re-encode the given source location as an MLIR location and return it.
Location getEncodedSourceLoc(SMLoc loc) override {
diff --git a/mlir/lib/Parser/AsmParserState.cpp b/mlir/lib/Parser/AsmParserState.cpp
index 5c59848bd3b29..a3aa3a71e5354 100644
--- a/mlir/lib/Parser/AsmParserState.cpp
+++ b/mlir/lib/Parser/AsmParserState.cpp
@@ -259,8 +259,7 @@ void AsmParserState::addDefinition(Block *block, SMLoc location) {
impl->blocks[it->second]->definition.loc = convertIdLocToRange(location);
}
-void AsmParserState::addDefinition(BlockArgument blockArg,
- SMLoc location) {
+void AsmParserState::addDefinition(BlockArgument blockArg, SMLoc location) {
auto it = impl->blocksToIdx.find(blockArg.getOwner());
assert(it != impl->blocksToIdx.end() &&
"expected owner block to have an entry");
diff --git a/mlir/lib/Parser/AttributeParser.cpp b/mlir/lib/Parser/AttributeParser.cpp
index 9f0b56d8ae9e2..72cec30dda6d2 100644
--- a/mlir/lib/Parser/AttributeParser.cpp
+++ b/mlir/lib/Parser/AttributeParser.cpp
@@ -525,8 +525,7 @@ ParseResult TensorLiteralParser::parse(bool allowHex) {
/// Build a dense attribute instance with the parsed elements and the given
/// shaped type.
-DenseElementsAttr TensorLiteralParser::getAttr(SMLoc loc,
- ShapedType type) {
+DenseElementsAttr TensorLiteralParser::getAttr(SMLoc loc, ShapedType type) {
Type eltType = type.getElementType();
// Check to see if we parse the literal from a hex string.
@@ -676,8 +675,7 @@ TensorLiteralParser::getFloatAttrElements(SMLoc loc, FloatType eltTy,
}
/// Build a Dense String attribute for the given type.
-DenseElementsAttr TensorLiteralParser::getStringAttr(SMLoc loc,
- ShapedType type,
+DenseElementsAttr TensorLiteralParser::getStringAttr(SMLoc loc, ShapedType type,
Type eltTy) {
if (hexStorage.has_value()) {
auto stringValue = hexStorage.value().getStringValue();
@@ -698,8 +696,7 @@ DenseElementsAttr TensorLiteralParser::getStringAttr(SMLoc loc,
}
/// Build a Dense attribute with hex data for the given type.
-DenseElementsAttr TensorLiteralParser::getHexAttr(SMLoc loc,
- ShapedType type) {
+DenseElementsAttr TensorLiteralParser::getHexAttr(SMLoc loc, ShapedType type) {
Type elementType = type.getElementType();
if (!elementType.isIntOrIndexOrFloat() && !elementType.isa<ComplexType>()) {
p.emitError(loc)
diff --git a/mlir/lib/Pass/IRPrinting.cpp b/mlir/lib/Pass/IRPrinting.cpp
index dff65b6fe77c5..c17963c511128 100644
--- a/mlir/lib/Pass/IRPrinting.cpp
+++ b/mlir/lib/Pass/IRPrinting.cpp
@@ -62,7 +62,8 @@ class OperationFingerPrint {
}
private:
- template <typename T> void addDataToHash(llvm::SHA1 &hasher, const T &data) {
+ template <typename T>
+ void addDataToHash(llvm::SHA1 &hasher, const T &data) {
hasher.update(
ArrayRef<uint8_t>(reinterpret_cast<const uint8_t *>(&data), sizeof(T)));
}
diff --git a/mlir/lib/Pass/PassRegistry.cpp b/mlir/lib/Pass/PassRegistry.cpp
index 709baea6bd529..9f0ce23c5b817 100644
--- a/mlir/lib/Pass/PassRegistry.cpp
+++ b/mlir/lib/Pass/PassRegistry.cpp
@@ -8,9 +8,9 @@
#include <utility>
-#include "mlir/Pass/PassRegistry.h"
#include "mlir/Pass/Pass.h"
#include "mlir/Pass/PassManager.h"
+#include "mlir/Pass/PassRegistry.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/Support/Format.h"
#include "llvm/Support/ManagedStatic.h"
diff --git a/mlir/lib/Rewrite/PatternApplicator.cpp b/mlir/lib/Rewrite/PatternApplicator.cpp
index edaf13e575d35..686b8e2330b0f 100644
--- a/mlir/lib/Rewrite/PatternApplicator.cpp
+++ b/mlir/lib/Rewrite/PatternApplicator.cpp
@@ -33,9 +33,9 @@ PatternApplicator::~PatternApplicator() = default;
#ifndef NDEBUG
/// Log a message for a pattern that is impossible to match.
static void logImpossibleToMatch(const Pattern &pattern) {
- llvm::dbgs() << "Ignoring pattern '" << pattern.getRootKind()
- << "' because it is impossible to match or cannot lead "
- "to legal IR (by cost model)\n";
+ llvm::dbgs() << "Ignoring pattern '" << pattern.getRootKind()
+ << "' because it is impossible to match or cannot lead "
+ "to legal IR (by cost model)\n";
}
/// Log IR after pattern application.
diff --git a/mlir/lib/Target/LLVMIR/Dialect/OpenACC/OpenACCToLLVMIRTranslation.cpp b/mlir/lib/Target/LLVMIR/Dialect/OpenACC/OpenACCToLLVMIRTranslation.cpp
index 49431d15ed819..d8ce25f2e9a38 100644
--- a/mlir/lib/Target/LLVMIR/Dialect/OpenACC/OpenACCToLLVMIRTranslation.cpp
+++ b/mlir/lib/Target/LLVMIR/Dialect/OpenACC/OpenACCToLLVMIRTranslation.cpp
@@ -341,10 +341,9 @@ static LogicalResult convertDataOp(acc::DataOp &op,
mapperAllocas)))
return failure();
- if (failed(processOperands(builder, moduleTranslation, op,
- op.createOperands(), totalNbOperand,
- kCreateFlag | kHoldFlag, flags, names, index,
- mapperAllocas)))
+ if (failed(processOperands(
+ builder, moduleTranslation, op, op.createOperands(), totalNbOperand,
+ kCreateFlag | kHoldFlag, flags, names, index, mapperAllocas)))
return failure();
// TODO create zero currenlty handled as create. Update when extension
@@ -355,10 +354,9 @@ static LogicalResult convertDataOp(acc::DataOp &op,
mapperAllocas)))
return failure();
- if (failed(processOperands(builder, moduleTranslation, op,
- op.presentOperands(), totalNbOperand,
- kPresentFlag | kHoldFlag, flags, names, index,
- mapperAllocas)))
+ if (failed(processOperands(
+ builder, moduleTranslation, op, op.presentOperands(), totalNbOperand,
+ kPresentFlag | kHoldFlag, flags, names, index, mapperAllocas)))
return failure();
llvm::GlobalVariable *maptypes =
diff --git a/mlir/lib/Target/SPIRV/Deserialization/Deserializer.h b/mlir/lib/Target/SPIRV/Deserialization/Deserializer.h
index d5a9e9913851b..442b8e369d77b 100644
--- a/mlir/lib/Target/SPIRV/Deserialization/Deserializer.h
+++ b/mlir/lib/Target/SPIRV/Deserialization/Deserializer.h
@@ -467,7 +467,8 @@ class Deserializer {
/// Method to deserialize an operation in the SPIR-V dialect that is a mirror
/// of an instruction in the SPIR-V spec. This is auto generated if hasOpcode
/// == 1 and autogenSerialization == 1 in ODS.
- template <typename OpTy> LogicalResult processOp(ArrayRef<uint32_t> words) {
+ template <typename OpTy>
+ LogicalResult processOp(ArrayRef<uint32_t> words) {
return emitError(unknownLoc, "unsupported deserialization for ")
<< OpTy::getOperationName() << " op";
}
diff --git a/mlir/lib/Target/SPIRV/Serialization/Serializer.h b/mlir/lib/Target/SPIRV/Serialization/Serializer.h
index 69d9461cd9c16..a338111fd2f2c 100644
--- a/mlir/lib/Target/SPIRV/Serialization/Serializer.h
+++ b/mlir/lib/Target/SPIRV/Serialization/Serializer.h
@@ -297,7 +297,8 @@ class Serializer {
/// Serializes an operation in the SPIR-V dialect that is a mirror of an
/// instruction in the SPIR-V spec. This is auto generated if hasOpcode == 1
/// and autogenSerialization == 1 in ODS.
- template <typename OpTy> LogicalResult processOp(OpTy op) {
+ template <typename OpTy>
+ LogicalResult processOp(OpTy op) {
return op.emitError("unsupported op serialization");
}
diff --git a/mlir/lib/Tools/PDLL/AST/Nodes.cpp b/mlir/lib/Tools/PDLL/AST/Nodes.cpp
index 3af6ddf4dba31..57b52fde62617 100644
--- a/mlir/lib/Tools/PDLL/AST/Nodes.cpp
+++ b/mlir/lib/Tools/PDLL/AST/Nodes.cpp
@@ -199,8 +199,7 @@ CompoundStmt *CompoundStmt::create(Context &ctx, SMRange loc,
// LetStmt
//===----------------------------------------------------------------------===//
-LetStmt *LetStmt::create(Context &ctx, SMRange loc,
- VariableDecl *varDecl) {
+LetStmt *LetStmt::create(Context &ctx, SMRange loc, VariableDecl *varDecl) {
return new (ctx.getAllocator().Allocate<LetStmt>()) LetStmt(loc, varDecl);
}
@@ -394,8 +393,7 @@ Optional<StringRef> OpConstraintDecl::getName() const {
// TypeConstraintDecl
//===----------------------------------------------------------------------===//
-TypeConstraintDecl *TypeConstraintDecl::create(Context &ctx,
- SMRange loc) {
+TypeConstraintDecl *TypeConstraintDecl::create(Context &ctx, SMRange loc) {
return new (ctx.getAllocator().Allocate<TypeConstraintDecl>())
TypeConstraintDecl(loc);
}
@@ -414,8 +412,8 @@ TypeRangeConstraintDecl *TypeRangeConstraintDecl::create(Context &ctx,
// ValueConstraintDecl
//===----------------------------------------------------------------------===//
-ValueConstraintDecl *
-ValueConstraintDecl::create(Context &ctx, SMRange loc, Expr *typeExpr) {
+ValueConstraintDecl *ValueConstraintDecl::create(Context &ctx, SMRange loc,
+ Expr *typeExpr) {
return new (ctx.getAllocator().Allocate<ValueConstraintDecl>())
ValueConstraintDecl(loc, typeExpr);
}
@@ -424,9 +422,8 @@ ValueConstraintDecl::create(Context &ctx, SMRange loc, Expr *typeExpr) {
// ValueRangeConstraintDecl
//===----------------------------------------------------------------------===//
-ValueRangeConstraintDecl *ValueRangeConstraintDecl::create(Context &ctx,
- SMRange loc,
- Expr *typeExpr) {
+ValueRangeConstraintDecl *
+ValueRangeConstraintDecl::create(Context &ctx, SMRange loc, Expr *typeExpr) {
return new (ctx.getAllocator().Allocate<ValueRangeConstraintDecl>())
ValueRangeConstraintDecl(loc, typeExpr);
}
@@ -498,8 +495,8 @@ OpNameDecl *OpNameDecl::create(Context &ctx, SMRange loc) {
// PatternDecl
//===----------------------------------------------------------------------===//
-PatternDecl *PatternDecl::create(Context &ctx, SMRange loc,
- const Name *name, Optional<uint16_t> benefit,
+PatternDecl *PatternDecl::create(Context &ctx, SMRange loc, const Name *name,
+ Optional<uint16_t> benefit,
bool hasBoundedRecursion,
const CompoundStmt *body) {
return new (ctx.getAllocator().Allocate<PatternDecl>())
@@ -554,8 +551,7 @@ VariableDecl *VariableDecl::create(Context &ctx, const Name &name, Type type,
// Module
//===----------------------------------------------------------------------===//
-Module *Module::create(Context &ctx, SMLoc loc,
- ArrayRef<Decl *> children) {
+Module *Module::create(Context &ctx, SMLoc loc, ArrayRef<Decl *> children) {
unsigned allocSize = Module::totalSizeToAlloc<Decl *>(children.size());
void *rawData = ctx.getAllocator().Allocate(allocSize, alignof(Module));
diff --git a/mlir/lib/Tools/PDLL/Parser/Lexer.cpp b/mlir/lib/Tools/PDLL/Parser/Lexer.cpp
index 250b21d4519e7..92bf4812d8bb4 100644
--- a/mlir/lib/Tools/PDLL/Parser/Lexer.cpp
+++ b/mlir/lib/Tools/PDLL/Parser/Lexer.cpp
@@ -44,18 +44,18 @@ std::string Token::getStringValue() const {
assert(i + 1 <= e && "invalid string should be caught by lexer");
auto c1 = bytes[i++];
switch (c1) {
- case '"':
- case '\\':
- result.push_back(c1);
- continue;
- case 'n':
- result.push_back('\n');
- continue;
- case 't':
- result.push_back('\t');
- continue;
- default:
- break;
+ case '"':
+ case '\\':
+ result.push_back(c1);
+ continue;
+ case 'n':
+ result.push_back('\n');
+ continue;
+ case 't':
+ result.push_back('\t');
+ continue;
+ default:
+ break;
}
assert(i + 1 <= e && "invalid string should be caught by lexer");
@@ -101,7 +101,8 @@ Lexer::Lexer(llvm::SourceMgr &mgr, ast::DiagnosticEngine &diagEngine,
}
Lexer::~Lexer() {
- if (addedHandlerToDiagEngine) diagEngine.setHandlerFn(nullptr);
+ if (addedHandlerToDiagEngine)
+ diagEngine.setHandlerFn(nullptr);
}
LogicalResult Lexer::pushInclude(StringRef filename, SMRange includeLoc) {
@@ -121,39 +122,39 @@ Token Lexer::emitError(SMRange loc, const Twine &msg) {
diagEngine.emitError(loc, msg);
return formToken(Token::error, loc.Start.getPointer());
}
-Token Lexer::emitErrorAndNote(SMRange loc, const Twine &msg,
- SMRange noteLoc, const Twine ¬e) {
+Token Lexer::emitErrorAndNote(SMRange loc, const Twine &msg, SMRange noteLoc,
+ const Twine ¬e) {
diagEngine.emitError(loc, msg)->attachNote(note, noteLoc);
return formToken(Token::error, loc.Start.getPointer());
}
Token Lexer::emitError(const char *loc, const Twine &msg) {
- return emitError(SMRange(SMLoc::getFromPointer(loc),
- SMLoc::getFromPointer(loc + 1)),
- msg);
+ return emitError(
+ SMRange(SMLoc::getFromPointer(loc), SMLoc::getFromPointer(loc + 1)), msg);
}
int Lexer::getNextChar() {
char curChar = *curPtr++;
switch (curChar) {
- default:
- return static_cast<unsigned char>(curChar);
- case 0: {
- // A nul character in the stream is either the end of the current buffer
- // or a random nul in the file. Disambiguate that here.
- if (curPtr - 1 != curBuffer.end()) return 0;
-
- // Otherwise, return end of file.
- --curPtr;
- return EOF;
- }
- case '\n':
- case '\r':
- // Handle the newline character by ignoring it and incrementing the line
- // count. However, be careful about 'dos style' files with \n\r in them.
- // Only treat a \n\r or \r\n as a single line.
- if ((*curPtr == '\n' || (*curPtr == '\r')) && *curPtr != curChar)
- ++curPtr;
- return '\n';
+ default:
+ return static_cast<unsigned char>(curChar);
+ case 0: {
+ // A nul character in the stream is either the end of the current buffer
+ // or a random nul in the file. Disambiguate that here.
+ if (curPtr - 1 != curBuffer.end())
+ return 0;
+
+ // Otherwise, return end of file.
+ --curPtr;
+ return EOF;
+ }
+ case '\n':
+ case '\r':
+ // Handle the newline character by ignoring it and incrementing the line
+ // count. However, be careful about 'dos style' files with \n\r in them.
+ // Only treat a \n\r or \r\n as a single line.
+ if ((*curPtr == '\n' || (*curPtr == '\r')) && *curPtr != curChar)
+ ++curPtr;
+ return '\n';
}
}
@@ -168,99 +169,100 @@ Token Lexer::lexToken() {
// This always consumes at least one character.
int curChar = getNextChar();
switch (curChar) {
- default:
- // Handle identifiers: [a-zA-Z_]
- if (isalpha(curChar) || curChar == '_') return lexIdentifier(tokStart);
-
- // Unknown character, emit an error.
- return emitError(tokStart, "unexpected character");
- case EOF: {
- // Return EOF denoting the end of lexing.
- Token eof = formToken(Token::eof, tokStart);
-
- // Check to see if we are in an included file.
- SMLoc parentIncludeLoc = srcMgr.getParentIncludeLoc(curBufferID);
- if (parentIncludeLoc.isValid()) {
- curBufferID = srcMgr.FindBufferContainingLoc(parentIncludeLoc);
- curBuffer = srcMgr.getMemoryBuffer(curBufferID)->getBuffer();
- curPtr = parentIncludeLoc.getPointer();
- }
-
- return eof;
+ default:
+ // Handle identifiers: [a-zA-Z_]
+ if (isalpha(curChar) || curChar == '_')
+ return lexIdentifier(tokStart);
+
+ // Unknown character, emit an error.
+ return emitError(tokStart, "unexpected character");
+ case EOF: {
+ // Return EOF denoting the end of lexing.
+ Token eof = formToken(Token::eof, tokStart);
+
+ // Check to see if we are in an included file.
+ SMLoc parentIncludeLoc = srcMgr.getParentIncludeLoc(curBufferID);
+ if (parentIncludeLoc.isValid()) {
+ curBufferID = srcMgr.FindBufferContainingLoc(parentIncludeLoc);
+ curBuffer = srcMgr.getMemoryBuffer(curBufferID)->getBuffer();
+ curPtr = parentIncludeLoc.getPointer();
+ }
+
+ return eof;
+ }
+
+ // Lex punctuation.
+ case '-':
+ if (*curPtr == '>') {
+ ++curPtr;
+ return formToken(Token::arrow, tokStart);
+ }
+ return emitError(tokStart, "unexpected character");
+ case ':':
+ return formToken(Token::colon, tokStart);
+ case ',':
+ return formToken(Token::comma, tokStart);
+ case '.':
+ return formToken(Token::dot, tokStart);
+ case '=':
+ if (*curPtr == '>') {
+ ++curPtr;
+ return formToken(Token::equal_arrow, tokStart);
+ }
+ return formToken(Token::equal, tokStart);
+ case ';':
+ return formToken(Token::semicolon, tokStart);
+ case '[':
+ if (*curPtr == '{') {
+ ++curPtr;
+ return lexString(tokStart, /*isStringBlock=*/true);
}
+ return formToken(Token::l_square, tokStart);
+ case ']':
+ return formToken(Token::r_square, tokStart);
+
+ case '<':
+ return formToken(Token::less, tokStart);
+ case '>':
+ return formToken(Token::greater, tokStart);
+ case '{':
+ return formToken(Token::l_brace, tokStart);
+ case '}':
+ return formToken(Token::r_brace, tokStart);
+ case '(':
+ return formToken(Token::l_paren, tokStart);
+ case ')':
+ return formToken(Token::r_paren, tokStart);
+ case '/':
+ if (*curPtr == '/') {
+ lexComment();
+ continue;
+ }
+ return emitError(tokStart, "unexpected character");
- // Lex punctuation.
- case '-':
- if (*curPtr == '>') {
- ++curPtr;
- return formToken(Token::arrow, tokStart);
- }
- return emitError(tokStart, "unexpected character");
- case ':':
- return formToken(Token::colon, tokStart);
- case ',':
- return formToken(Token::comma, tokStart);
- case '.':
- return formToken(Token::dot, tokStart);
- case '=':
- if (*curPtr == '>') {
- ++curPtr;
- return formToken(Token::equal_arrow, tokStart);
- }
- return formToken(Token::equal, tokStart);
- case ';':
- return formToken(Token::semicolon, tokStart);
- case '[':
- if (*curPtr == '{') {
- ++curPtr;
- return lexString(tokStart, /*isStringBlock=*/true);
- }
- return formToken(Token::l_square, tokStart);
- case ']':
- return formToken(Token::r_square, tokStart);
-
- case '<':
- return formToken(Token::less, tokStart);
- case '>':
- return formToken(Token::greater, tokStart);
- case '{':
- return formToken(Token::l_brace, tokStart);
- case '}':
- return formToken(Token::r_brace, tokStart);
- case '(':
- return formToken(Token::l_paren, tokStart);
- case ')':
- return formToken(Token::r_paren, tokStart);
- case '/':
- if (*curPtr == '/') {
- lexComment();
- continue;
- }
- return emitError(tokStart, "unexpected character");
-
- // Ignore whitespace characters.
- case 0:
- case ' ':
- case '\t':
- case '\n':
- return lexToken();
-
- case '#':
- return lexDirective(tokStart);
- case '"':
- return lexString(tokStart, /*isStringBlock=*/false);
-
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
- return lexNumber(tokStart);
+ // Ignore whitespace characters.
+ case 0:
+ case ' ':
+ case '\t':
+ case '\n':
+ return lexToken();
+
+ case '#':
+ return lexDirective(tokStart);
+ case '"':
+ return lexString(tokStart, /*isStringBlock=*/false);
+
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ return lexNumber(tokStart);
}
}
}
@@ -273,27 +275,28 @@ void Lexer::lexComment() {
while (true) {
switch (*curPtr++) {
- case '\n':
- case '\r':
- // Newline is end of comment.
+ case '\n':
+ case '\r':
+ // Newline is end of comment.
+ return;
+ case 0:
+ // If this is the end of the buffer, end the comment.
+ if (curPtr - 1 == curBuffer.end()) {
+ --curPtr;
return;
- case 0:
- // If this is the end of the buffer, end the comment.
- if (curPtr - 1 == curBuffer.end()) {
- --curPtr;
- return;
- }
- LLVM_FALLTHROUGH;
- default:
- // Skip over other characters.
- break;
+ }
+ LLVM_FALLTHROUGH;
+ default:
+ // Skip over other characters.
+ break;
}
}
}
Token Lexer::lexDirective(const char *tokStart) {
// Match the rest with an identifier regex: [0-9a-zA-Z_]*
- while (isalnum(*curPtr) || *curPtr == '_') ++curPtr;
+ while (isalnum(*curPtr) || *curPtr == '_')
+ ++curPtr;
StringRef str(tokStart, curPtr - tokStart);
return Token(Token::directive, str);
@@ -301,7 +304,8 @@ Token Lexer::lexDirective(const char *tokStart) {
Token Lexer::lexIdentifier(const char *tokStart) {
// Match the rest of the identifier regex: [0-9a-zA-Z_]*
- while (isalnum(*curPtr) || *curPtr == '_') ++curPtr;
+ while (isalnum(*curPtr) || *curPtr == '_')
+ ++curPtr;
// Check to see if this identifier is a keyword.
StringRef str(tokStart, curPtr - tokStart);
@@ -334,7 +338,8 @@ Token Lexer::lexNumber(const char *tokStart) {
assert(isdigit(curPtr[-1]));
// Handle the normal decimal case.
- while (isdigit(*curPtr)) ++curPtr;
+ while (isdigit(*curPtr))
+ ++curPtr;
return formToken(Token::integer, tokStart);
}
@@ -352,54 +357,54 @@ Token Lexer::lexString(const char *tokStart, bool isStringBlock) {
}
switch (*curPtr++) {
- case '"':
- // If this is a string block, we only end the string when we encounter a
- // `}]`.
- if (!isStringBlock)
- return formToken(Token::string, tokStart);
+ case '"':
+ // If this is a string block, we only end the string when we encounter a
+ // `}]`.
+ if (!isStringBlock)
+ return formToken(Token::string, tokStart);
+ continue;
+ case '}':
+ // If this is a string block, we only end the string when we encounter a
+ // `}]`.
+ if (!isStringBlock || *curPtr != ']')
continue;
- case '}':
- // If this is a string block, we only end the string when we encounter a
- // `}]`.
- if (!isStringBlock || *curPtr != ']')
- continue;
- ++curPtr;
- return formToken(Token::string_block, tokStart);
- case 0: {
- // If this is a random nul character in the middle of a string, just
- // include it. If it is the end of file, then it is an error.
- if (curPtr - 1 != curBuffer.end())
- continue;
- --curPtr;
+ ++curPtr;
+ return formToken(Token::string_block, tokStart);
+ case 0: {
+ // If this is a random nul character in the middle of a string, just
+ // include it. If it is the end of file, then it is an error.
+ if (curPtr - 1 != curBuffer.end())
+ continue;
+ --curPtr;
- StringRef expectedEndStr = isStringBlock ? "}]" : "\"";
- return emitError(curPtr - 1,
- "expected '" + expectedEndStr + "' in string literal");
- }
+ StringRef expectedEndStr = isStringBlock ? "}]" : "\"";
+ return emitError(curPtr - 1,
+ "expected '" + expectedEndStr + "' in string literal");
+ }
- case '\n':
- case '\v':
- case '\f':
- // String blocks allow multiple lines.
- if (!isStringBlock)
- return emitError(curPtr - 1, "expected '\"' in string literal");
- continue;
+ case '\n':
+ case '\v':
+ case '\f':
+ // String blocks allow multiple lines.
+ if (!isStringBlock)
+ return emitError(curPtr - 1, "expected '\"' in string literal");
+ continue;
- case '\\':
- // Handle explicitly a few escapes.
- if (*curPtr == '"' || *curPtr == '\\' || *curPtr == 'n' ||
- *curPtr == 't') {
- ++curPtr;
- } else if (llvm::isHexDigit(*curPtr) && llvm::isHexDigit(curPtr[1])) {
- // Support \xx for two hex digits.
- curPtr += 2;
- } else {
- return emitError(curPtr - 1, "unknown escape in string literal");
- }
- continue;
+ case '\\':
+ // Handle explicitly a few escapes.
+ if (*curPtr == '"' || *curPtr == '\\' || *curPtr == 'n' ||
+ *curPtr == 't') {
+ ++curPtr;
+ } else if (llvm::isHexDigit(*curPtr) && llvm::isHexDigit(curPtr[1])) {
+ // Support \xx for two hex digits.
+ curPtr += 2;
+ } else {
+ return emitError(curPtr - 1, "unknown escape in string literal");
+ }
+ continue;
- default:
- continue;
+ default:
+ continue;
}
}
}
diff --git a/mlir/lib/Tools/PDLL/Parser/Lexer.h b/mlir/lib/Tools/PDLL/Parser/Lexer.h
index 1c521f37bce33..6a78669f854d5 100644
--- a/mlir/lib/Tools/PDLL/Parser/Lexer.h
+++ b/mlir/lib/Tools/PDLL/Parser/Lexer.h
@@ -133,7 +133,8 @@ class Token {
/// Return if the token does not have the given kind.
bool isNot(Kind k) const { return k != kind; }
- template <typename... T> bool isNot(Kind k1, Kind k2, T... others) const {
+ template <typename... T>
+ bool isNot(Kind k1, Kind k2, T... others) const {
return !isAny(k1, k2, others...);
}
@@ -141,17 +142,13 @@ class Token {
bool is(Kind k) const { return kind == k; }
/// Return a location for the start of this token.
- SMLoc getStartLoc() const {
- return SMLoc::getFromPointer(spelling.data());
- }
+ SMLoc getStartLoc() const { return SMLoc::getFromPointer(spelling.data()); }
/// Return a location at the end of this token.
SMLoc getEndLoc() const {
return SMLoc::getFromPointer(spelling.data() + spelling.size());
}
/// Return a location for the range of this token.
- SMRange getLoc() const {
- return SMRange(getStartLoc(), getEndLoc());
- }
+ SMRange getLoc() const { return SMRange(getStartLoc(), getEndLoc()); }
private:
/// Discriminator that indicates the kind of token this is.
@@ -193,8 +190,8 @@ class Lexer {
/// Emit an error to the lexer with the given location and message.
Token emitError(SMRange loc, const Twine &msg);
Token emitError(const char *loc, const Twine &msg);
- Token emitErrorAndNote(SMRange loc, const Twine &msg,
- SMRange noteLoc, const Twine ¬e);
+ Token emitErrorAndNote(SMRange loc, const Twine &msg, SMRange noteLoc,
+ const Twine ¬e);
private:
Token formToken(Token::Kind kind, const char *tokStart) {
diff --git a/mlir/lib/Transforms/ViewOpGraph.cpp b/mlir/lib/Transforms/ViewOpGraph.cpp
index 538fb18ad19cc..1cd0164f6dd39 100644
--- a/mlir/lib/Transforms/ViewOpGraph.cpp
+++ b/mlir/lib/Transforms/ViewOpGraph.cpp
@@ -314,8 +314,7 @@ class PrintOpPass : public ViewOpGraphBase<PrintOpPass> {
} // namespace
-std::unique_ptr<Pass>
-mlir::createPrintOpGraphPass(raw_ostream &os) {
+std::unique_ptr<Pass> mlir::createPrintOpGraphPass(raw_ostream &os) {
return std::make_unique<PrintOpPass>(os);
}
diff --git a/mlir/tools/mlir-tblgen/OpFormatGen.cpp b/mlir/tools/mlir-tblgen/OpFormatGen.cpp
index 54190aac15fa0..c3b9ded76e8be 100644
--- a/mlir/tools/mlir-tblgen/OpFormatGen.cpp
+++ b/mlir/tools/mlir-tblgen/OpFormatGen.cpp
@@ -2147,7 +2147,8 @@ void OperationFormat::genPrinter(Operator &op, OpClass &opClass) {
/// Function to find an element within the given range that has the same name as
/// 'name'.
-template <typename RangeT> static auto findArg(RangeT &&range, StringRef name) {
+template <typename RangeT>
+static auto findArg(RangeT &&range, StringRef name) {
auto it = llvm::find_if(range, [=](auto &arg) { return arg.name == name; });
return it != range.end() ? &*it : nullptr;
}
diff --git a/mlir/unittests/Support/DebugActionTest.cpp b/mlir/unittests/Support/DebugActionTest.cpp
index 0a73436f572d7..4ecaf128a1050 100644
--- a/mlir/unittests/Support/DebugActionTest.cpp
+++ b/mlir/unittests/Support/DebugActionTest.cpp
@@ -70,9 +70,7 @@ TEST(DebugActionTest, DebugCounterHandler) {
// Handler that uses the number of action executions as the decider.
struct DebugCounterHandler : public SimpleAction::Handler {
- FailureOr<bool> shouldExecute() final {
- return numExecutions++ < 3;
- }
+ FailureOr<bool> shouldExecute() final { return numExecutions++ < 3; }
unsigned numExecutions = 0;
};
manager.registerActionHandler<DebugCounterHandler>();
diff --git a/mlir/unittests/TableGen/OpBuildGen.cpp b/mlir/unittests/TableGen/OpBuildGen.cpp
index cf85762f2ef41..4f543cb7764fe 100644
--- a/mlir/unittests/TableGen/OpBuildGen.cpp
+++ b/mlir/unittests/TableGen/OpBuildGen.cpp
@@ -77,8 +77,8 @@ class OpBuildGenTest : public ::testing::Test {
verifyOp(std::move(op), {i32Ty}, {*cstI32, *cstI32}, noAttrs);
// Test collective params build method.
- op =
- builder.create<OpTy>(loc, TypeRange{i32Ty}, ValueRange{*cstI32, *cstI32});
+ op = builder.create<OpTy>(loc, TypeRange{i32Ty},
+ ValueRange{*cstI32, *cstI32});
verifyOp(std::move(op), {i32Ty}, {*cstI32, *cstI32}, noAttrs);
// Test build method with no result types, default value of attributes.
More information about the Mlir-commits
mailing list