diff options
Diffstat (limited to 'mlir/test/lib')
-rw-r--r-- | mlir/test/lib/Analysis/DataFlow/TestLivenessAnalysis.cpp | 1 | ||||
-rw-r--r-- | mlir/test/lib/Dialect/ArmNeon/TestLowerToArmNeon.cpp | 1 | ||||
-rw-r--r-- | mlir/test/lib/Dialect/Mesh/TestOpLowering.cpp | 1 | ||||
-rw-r--r-- | mlir/test/lib/Dialect/Mesh/TestReshardingSpmdization.cpp | 1 | ||||
-rw-r--r-- | mlir/test/lib/Dialect/Test/TestAttributes.cpp | 1 | ||||
-rw-r--r-- | mlir/test/lib/Dialect/Test/TestDialect.cpp | 1 | ||||
-rw-r--r-- | mlir/test/lib/Dialect/Test/TestOpDefs.cpp | 2 | ||||
-rw-r--r-- | mlir/test/lib/Dialect/Test/TestOps.h | 10 | ||||
-rw-r--r-- | mlir/test/lib/Dialect/Test/TestOps.td | 12 | ||||
-rw-r--r-- | mlir/test/lib/Dialect/Test/TestOpsSyntax.cpp | 2 | ||||
-rw-r--r-- | mlir/test/lib/Dialect/Test/TestOpsSyntax.td | 8 | ||||
-rw-r--r-- | mlir/test/lib/Dialect/Test/TestTypeDefs.td | 2 | ||||
-rw-r--r-- | mlir/test/lib/Dialect/Test/TestTypes.h | 4 |
13 files changed, 20 insertions, 26 deletions
diff --git a/mlir/test/lib/Analysis/DataFlow/TestLivenessAnalysis.cpp b/mlir/test/lib/Analysis/DataFlow/TestLivenessAnalysis.cpp index 6a67ddd..43005e2 100644 --- a/mlir/test/lib/Analysis/DataFlow/TestLivenessAnalysis.cpp +++ b/mlir/test/lib/Analysis/DataFlow/TestLivenessAnalysis.cpp @@ -18,7 +18,6 @@ #include <mlir/Pass/Pass.h> #include <mlir/Pass/PassRegistry.h> #include <mlir/Support/LLVM.h> -#include <mlir/Support/LogicalResult.h> #include <mlir/Support/TypeID.h> using namespace mlir; diff --git a/mlir/test/lib/Dialect/ArmNeon/TestLowerToArmNeon.cpp b/mlir/test/lib/Dialect/ArmNeon/TestLowerToArmNeon.cpp index 2e5a4a9..f6bfd9f 100644 --- a/mlir/test/lib/Dialect/ArmNeon/TestLowerToArmNeon.cpp +++ b/mlir/test/lib/Dialect/ArmNeon/TestLowerToArmNeon.cpp @@ -17,7 +17,6 @@ #include "mlir/IR/PatternMatch.h" #include "mlir/Pass/Pass.h" #include "mlir/Pass/PassManager.h" -#include "mlir/Support/LogicalResult.h" #include "mlir/Transforms/GreedyPatternRewriteDriver.h" #define PASS_NAME "test-lower-to-arm-neon" diff --git a/mlir/test/lib/Dialect/Mesh/TestOpLowering.cpp b/mlir/test/lib/Dialect/Mesh/TestOpLowering.cpp index 321b6a4..1f836be 100644 --- a/mlir/test/lib/Dialect/Mesh/TestOpLowering.cpp +++ b/mlir/test/lib/Dialect/Mesh/TestOpLowering.cpp @@ -11,7 +11,6 @@ #include "mlir/Dialect/Utils/IndexingUtils.h" #include "mlir/IR/SymbolTable.h" #include "mlir/Pass/Pass.h" -#include "mlir/Support/LogicalResult.h" #include "mlir/Transforms/GreedyPatternRewriteDriver.h" using namespace mlir; diff --git a/mlir/test/lib/Dialect/Mesh/TestReshardingSpmdization.cpp b/mlir/test/lib/Dialect/Mesh/TestReshardingSpmdization.cpp index 5e3918f..f964102 100644 --- a/mlir/test/lib/Dialect/Mesh/TestReshardingSpmdization.cpp +++ b/mlir/test/lib/Dialect/Mesh/TestReshardingSpmdization.cpp @@ -19,7 +19,6 @@ #include "mlir/IR/SymbolTable.h" #include "mlir/IR/Value.h" #include "mlir/Pass/Pass.h" -#include "mlir/Support/LogicalResult.h" #include "mlir/Transforms/GreedyPatternRewriteDriver.h" using namespace mlir; diff --git a/mlir/test/lib/Dialect/Test/TestAttributes.cpp b/mlir/test/lib/Dialect/Test/TestAttributes.cpp index d7e40d3..b66dfbf 100644 --- a/mlir/test/lib/Dialect/Test/TestAttributes.cpp +++ b/mlir/test/lib/Dialect/Test/TestAttributes.cpp @@ -17,7 +17,6 @@ #include "mlir/IR/DialectImplementation.h" #include "mlir/IR/ExtensibleDialect.h" #include "mlir/IR/Types.h" -#include "mlir/Support/LogicalResult.h" #include "llvm/ADT/APFloat.h" #include "llvm/ADT/Hashing.h" #include "llvm/ADT/StringExtras.h" diff --git a/mlir/test/lib/Dialect/Test/TestDialect.cpp b/mlir/test/lib/Dialect/Test/TestDialect.cpp index bfb9592..1bbf2cc 100644 --- a/mlir/test/lib/Dialect/Test/TestDialect.cpp +++ b/mlir/test/lib/Dialect/Test/TestDialect.cpp @@ -28,7 +28,6 @@ #include "mlir/Interfaces/FunctionImplementation.h" #include "mlir/Interfaces/InferIntRangeInterface.h" #include "mlir/Support/LLVM.h" -#include "mlir/Support/LogicalResult.h" #include "mlir/Transforms/FoldUtils.h" #include "mlir/Transforms/InliningUtils.h" #include "llvm/ADT/STLFunctionalExtras.h" diff --git a/mlir/test/lib/Dialect/Test/TestOpDefs.cpp b/mlir/test/lib/Dialect/Test/TestOpDefs.cpp index b86f692..fbaa102 100644 --- a/mlir/test/lib/Dialect/Test/TestOpDefs.cpp +++ b/mlir/test/lib/Dialect/Test/TestOpDefs.cpp @@ -1193,7 +1193,7 @@ void TestVersionedOpA::writeProperties(mlir::DialectBytecodeWriter &writer) { // TestOpWithVersionedProperties //===----------------------------------------------------------------------===// -mlir::LogicalResult TestOpWithVersionedProperties::readFromMlirBytecode( +llvm::LogicalResult TestOpWithVersionedProperties::readFromMlirBytecode( mlir::DialectBytecodeReader &reader, test::VersionedProperties &prop) { uint64_t value1, value2 = 0; if (failed(reader.readVarInt(value1))) diff --git a/mlir/test/lib/Dialect/Test/TestOps.h b/mlir/test/lib/Dialect/Test/TestOps.h index 837ccca..f070c3b 100644 --- a/mlir/test/lib/Dialect/Test/TestOps.h +++ b/mlir/test/lib/Dialect/Test/TestOps.h @@ -70,7 +70,7 @@ struct PropertiesWithCustomPrint { } }; -mlir::LogicalResult setPropertiesFromAttribute( +llvm::LogicalResult setPropertiesFromAttribute( PropertiesWithCustomPrint &prop, mlir::Attribute attr, llvm::function_ref<mlir::InFlightDiagnostic()> emitError); mlir::DictionaryAttr @@ -92,7 +92,7 @@ public: // These three methods are invoked through the `MyStructProperty` wrapper // defined in TestOps.td mlir::Attribute asAttribute(mlir::MLIRContext *ctx) const; - static mlir::LogicalResult + static llvm::LogicalResult setFromAttr(MyPropStruct &prop, mlir::Attribute attr, llvm::function_ref<mlir::InFlightDiagnostic()> emitError); llvm::hash_code hash() const; @@ -101,7 +101,7 @@ public: } }; -mlir::LogicalResult readFromMlirBytecode(mlir::DialectBytecodeReader &reader, +llvm::LogicalResult readFromMlirBytecode(mlir::DialectBytecodeReader &reader, MyPropStruct &prop); void writeToMlirBytecode(mlir::DialectBytecodeWriter &writer, MyPropStruct &prop); @@ -122,7 +122,7 @@ struct VersionedProperties { } }; -mlir::LogicalResult setPropertiesFromAttribute( +llvm::LogicalResult setPropertiesFromAttribute( VersionedProperties &prop, mlir::Attribute attr, llvm::function_ref<mlir::InFlightDiagnostic()> emitError); mlir::DictionaryAttr getPropertiesAsAttribute(mlir::MLIRContext *ctx, @@ -137,7 +137,7 @@ mlir::ParseResult customParseProperties(mlir::OpAsmParser &parser, // Bytecode Support //===----------------------------------------------------------------------===// -mlir::LogicalResult readFromMlirBytecode(mlir::DialectBytecodeReader &reader, +llvm::LogicalResult readFromMlirBytecode(mlir::DialectBytecodeReader &reader, llvm::MutableArrayRef<int64_t> prop); void writeToMlirBytecode(mlir::DialectBytecodeWriter &writer, llvm::ArrayRef<int64_t> prop); diff --git a/mlir/test/lib/Dialect/Test/TestOps.td b/mlir/test/lib/Dialect/Test/TestOps.td index c77f76d..e1ec142 100644 --- a/mlir/test/lib/Dialect/Test/TestOps.td +++ b/mlir/test/lib/Dialect/Test/TestOps.td @@ -462,7 +462,7 @@ def VariadicRegionInferredTypesOp : TEST_Op<"variadic_region_inferred", let results = (outs Variadic<AnyType>); let extraClassDeclaration = [{ - static mlir::LogicalResult inferReturnTypes(mlir::MLIRContext *context, + static llvm::LogicalResult inferReturnTypes(mlir::MLIRContext *context, std::optional<::mlir::Location> location, mlir::ValueRange operands, mlir::DictionaryAttr attributes, mlir::OpaqueProperties properties, mlir::RegionRange regions, llvm::SmallVectorImpl<mlir::Type> &inferredReturnTypes) { @@ -1368,7 +1368,7 @@ def TestOpInPlaceFoldSuccess : TEST_Op<"op_in_place_fold_success"> { let results = (outs Variadic<I1>); let hasFolder = 1; let extraClassDefinition = [{ - ::mlir::LogicalResult $cppClass::fold(FoldAdaptor adaptor, + ::llvm::LogicalResult $cppClass::fold(FoldAdaptor adaptor, SmallVectorImpl<OpFoldResult> &results) { return success(); } @@ -2408,7 +2408,7 @@ class TableGenBuildInferReturnTypeBaseOp<string mnemonic, let results = (outs AnyType:$result); let extraClassDeclaration = [{ - static ::mlir::LogicalResult inferReturnTypes(::mlir::MLIRContext *, + static ::llvm::LogicalResult inferReturnTypes(::mlir::MLIRContext *, ::std::optional<::mlir::Location> location, ::mlir::ValueRange operands, ::mlir::DictionaryAttr attributes, mlir::OpaqueProperties properties, ::mlir::RegionRange regions, ::llvm::SmallVectorImpl<::mlir::Type> &inferredReturnTypes) { @@ -3037,7 +3037,7 @@ def TestOpWithNiceProperties : TEST_Op<"with_nice_properties"> { ::mlir::ArrayRef<::llvm::StringRef> elidedProps); static ::mlir::ParseResult parseProperties(::mlir::OpAsmParser &parser, ::mlir::OperationState &result); - static ::mlir::LogicalResult readFromMlirBytecode( + static ::llvm::LogicalResult readFromMlirBytecode( ::mlir::DialectBytecodeReader &, test::PropertiesWithCustomPrint &prop); static void writeToMlirBytecode( @@ -3045,7 +3045,7 @@ def TestOpWithNiceProperties : TEST_Op<"with_nice_properties"> { const test::PropertiesWithCustomPrint &prop); }]; let extraClassDefinition = [{ - ::mlir::LogicalResult TestOpWithNiceProperties::readFromMlirBytecode( + ::llvm::LogicalResult TestOpWithNiceProperties::readFromMlirBytecode( ::mlir::DialectBytecodeReader &reader, test::PropertiesWithCustomPrint &prop) { StringRef label; @@ -3101,7 +3101,7 @@ def TestOpWithVersionedProperties : TEST_Op<"with_versioned_properties"> { ::mlir::ArrayRef<::llvm::StringRef> elidedProps); static ::mlir::ParseResult parseProperties(::mlir::OpAsmParser &parser, ::mlir::OperationState &result); - static ::mlir::LogicalResult readFromMlirBytecode( + static ::llvm::LogicalResult readFromMlirBytecode( ::mlir::DialectBytecodeReader &, test::VersionedProperties &prop); static void writeToMlirBytecode( diff --git a/mlir/test/lib/Dialect/Test/TestOpsSyntax.cpp b/mlir/test/lib/Dialect/Test/TestOpsSyntax.cpp index ebaced5..664951f 100644 --- a/mlir/test/lib/Dialect/Test/TestOpsSyntax.cpp +++ b/mlir/test/lib/Dialect/Test/TestOpsSyntax.cpp @@ -280,7 +280,7 @@ void ParseB64BytesOp::print(OpAsmPrinter &p) { p << " \"" << llvm::encodeBase64(getB64()) << "\""; } -::mlir::LogicalResult FormatInferType2Op::inferReturnTypes( +::llvm::LogicalResult FormatInferType2Op::inferReturnTypes( ::mlir::MLIRContext *context, ::std::optional<::mlir::Location> location, ::mlir::ValueRange operands, ::mlir::DictionaryAttr attributes, OpaqueProperties properties, ::mlir::RegionRange regions, diff --git a/mlir/test/lib/Dialect/Test/TestOpsSyntax.td b/mlir/test/lib/Dialect/Test/TestOpsSyntax.td index 9522a77..3129085 100644 --- a/mlir/test/lib/Dialect/Test/TestOpsSyntax.td +++ b/mlir/test/lib/Dialect/Test/TestOpsSyntax.td @@ -632,7 +632,7 @@ def FormatInferTypeOp : TEST_Op<"format_infer_type", [InferTypeOpInterface]> { let assemblyFormat = "attr-dict"; let extraClassDeclaration = [{ - static ::mlir::LogicalResult inferReturnTypes(::mlir::MLIRContext *context, + static ::llvm::LogicalResult inferReturnTypes(::mlir::MLIRContext *context, ::std::optional<::mlir::Location> location, ::mlir::ValueRange operands, ::mlir::DictionaryAttr attributes, mlir::OpaqueProperties properties, ::mlir::RegionRange regions, ::llvm::SmallVectorImpl<::mlir::Type> &inferredReturnTypes) { @@ -655,7 +655,7 @@ class FormatInferAllTypesBaseOp<string mnemonic, list<Trait> traits = []> let arguments = (ins Variadic<AnyType>:$args); let results = (outs Variadic<AnyType>:$outs); let extraClassDeclaration = [{ - static ::mlir::LogicalResult inferReturnTypes(::mlir::MLIRContext *context, + static ::llvm::LogicalResult inferReturnTypes(::mlir::MLIRContext *context, ::std::optional<::mlir::Location> location, ::mlir::ValueRange operands, ::mlir::DictionaryAttr attributes, mlir::OpaqueProperties properties, ::mlir::RegionRange regions, ::llvm::SmallVectorImpl<::mlir::Type> &inferredReturnTypes) { @@ -702,7 +702,7 @@ def FormatInferTypeRegionsOp let regions = (region AnyRegion:$region); let assemblyFormat = "$region attr-dict"; let extraClassDeclaration = [{ - static ::mlir::LogicalResult inferReturnTypes(::mlir::MLIRContext *context, + static ::llvm::LogicalResult inferReturnTypes(::mlir::MLIRContext *context, ::std::optional<::mlir::Location> location, ::mlir::ValueRange operands, ::mlir::DictionaryAttr attributes, mlir::OpaqueProperties properties, ::mlir::RegionRange regions, ::llvm::SmallVectorImpl<::mlir::Type> &inferredReturnTypes) { @@ -723,7 +723,7 @@ def FormatInferTypeVariadicOperandsOp let results = (outs Variadic<AnyType>:$outs); let assemblyFormat = "`(` $a `:` type($a) `)` `(` $b `:` type($b) `)` attr-dict"; let extraClassDeclaration = [{ - static ::mlir::LogicalResult inferReturnTypes(::mlir::MLIRContext *context, + static ::llvm::LogicalResult inferReturnTypes(::mlir::MLIRContext *context, ::std::optional<::mlir::Location> location, ::mlir::ValueRange operands, ::mlir::DictionaryAttr attributes, mlir::OpaqueProperties properties, ::mlir::RegionRange regions, ::llvm::SmallVectorImpl<::mlir::Type> &inferredReturnTypes) { diff --git a/mlir/test/lib/Dialect/Test/TestTypeDefs.td b/mlir/test/lib/Dialect/Test/TestTypeDefs.td index 492642b..d96152a 100644 --- a/mlir/test/lib/Dialect/Test/TestTypeDefs.td +++ b/mlir/test/lib/Dialect/Test/TestTypeDefs.td @@ -154,7 +154,7 @@ def TestTypeWithLayoutType : Test_Type<"TestTypeWithLayout", [ let mnemonic = "test_type_with_layout"; let parameters = (ins "unsigned":$key); let extraClassDeclaration = [{ - ::mlir::LogicalResult verifyEntries(::mlir::DataLayoutEntryListRef params, + ::llvm::LogicalResult verifyEntries(::mlir::DataLayoutEntryListRef params, ::mlir::Location loc) const; private: diff --git a/mlir/test/lib/Dialect/Test/TestTypes.h b/mlir/test/lib/Dialect/Test/TestTypes.h index da56049..cef3f05 100644 --- a/mlir/test/lib/Dialect/Test/TestTypes.h +++ b/mlir/test/lib/Dialect/Test/TestTypes.h @@ -108,7 +108,7 @@ struct TestRecursiveTypeStorage : public ::mlir::TypeStorage { TestRecursiveTypeStorage(allocator.copyInto(key)); } - ::mlir::LogicalResult mutate(::mlir::TypeStorageAllocator &allocator, + ::llvm::LogicalResult mutate(::mlir::TypeStorageAllocator &allocator, ::mlir::Type newBody) { // Cannot set a different body than before. if (body && body != newBody) @@ -140,7 +140,7 @@ public: } /// Body getter and setter. - ::mlir::LogicalResult setBody(Type body) { return Base::mutate(body); } + ::llvm::LogicalResult setBody(Type body) { return Base::mutate(body); } ::mlir::Type getBody() const { return getImpl()->body; } /// Name/key getter. |