Skip to content

mlir/LogicalResult: move into llvm #97309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 2, 2024
Merged

Conversation

artagnon
Copy link
Contributor

@artagnon artagnon commented Jul 1, 2024

This patch is part of a project to move the Presburger library into LLVM.

This patch is part of a project to move the Presburger library into
LLVM.
@llvmbot
Copy link
Member

llvmbot commented Jul 1, 2024

@llvm/pr-subscribers-mlir-emitc
@llvm/pr-subscribers-mlir-tosa
@llvm/pr-subscribers-mlir-nvgpu
@llvm/pr-subscribers-mlir-openacc
@llvm/pr-subscribers-flang-openmp
@llvm/pr-subscribers-mlir-vector
@llvm/pr-subscribers-mlir-irdl
@llvm/pr-subscribers-mlir-openmp
@llvm/pr-subscribers-mlir-scf
@llvm/pr-subscribers-mlir-spirv
@llvm/pr-subscribers-mlir-llvm

@llvm/pr-subscribers-mlir-sparse

Author: Ramkumar Ramachandra (artagnon)

Changes

This patch is part of a project to move the Presburger library into LLVM.


Patch is 352.44 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/97309.diff

314 Files Affected:

  • (modified) flang/include/flang/Optimizer/CodeGen/FIROpPatterns.h (+6-6)
  • (modified) flang/include/flang/Optimizer/CodeGen/TypeConverter.h (+1-1)
  • (modified) flang/include/flang/Optimizer/Dialect/FirAliasTagOpInterface.h (+2-2)
  • (modified) flang/include/flang/Optimizer/Dialect/FortranVariableInterface.td (+1-1)
  • (modified) flang/include/flang/Optimizer/Dialect/Support/KindMapping.h (+1-1)
  • (modified) flang/include/flang/Optimizer/HLFIR/HLFIROps.td (+4-4)
  • (modified) flang/lib/Optimizer/CodeGen/CodeGen.cpp (+69-69)
  • (modified) flang/lib/Optimizer/CodeGen/CodeGenOpenMP.cpp (+1-1)
  • (modified) flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp (+7-7)
  • (modified) flang/lib/Optimizer/CodeGen/TargetRewrite.cpp (+1-1)
  • (modified) flang/lib/Optimizer/CodeGen/TypeConverter.cpp (+1-1)
  • (modified) flang/lib/Optimizer/Dialect/CUF/CUFOps.cpp (+7-7)
  • (modified) flang/lib/Optimizer/Dialect/FIROps.cpp (+43-43)
  • (modified) flang/lib/Optimizer/Dialect/FIRType.cpp (+11-11)
  • (modified) flang/lib/Optimizer/Dialect/FirAliasTagOpInterface.cpp (+3-3)
  • (modified) flang/lib/Optimizer/Dialect/FortranVariableInterface.cpp (+1-1)
  • (modified) flang/lib/Optimizer/Dialect/Support/KindMapping.cpp (+2-2)
  • (modified) flang/lib/Optimizer/HLFIR/IR/HLFIROps.cpp (+42-42)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/BufferizeHLFIR.cpp (+13-14)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/ConvertToFIR.cpp (+9-9)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/InlineElementals.cpp (+1-1)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/LowerHLFIRIntrinsics.cpp (+6-7)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/LowerHLFIROrderedAssignments.cpp (+4-4)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/OptimizedBufferization.cpp (+8-8)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/SimplifyHLFIRIntrinsics.cpp (+1-1)
  • (modified) flang/lib/Optimizer/Transforms/AbstractResult.cpp (+5-5)
  • (modified) flang/lib/Optimizer/Transforms/AffineDemotion.cpp (+2-2)
  • (modified) flang/lib/Optimizer/Transforms/AffinePromotion.cpp (+2-2)
  • (modified) flang/lib/Optimizer/Transforms/ArrayValueCopy.cpp (+7-7)
  • (modified) flang/lib/Optimizer/Transforms/AssumedRankOpConversion.cpp (+2-2)
  • (modified) flang/lib/Optimizer/Transforms/CharacterConversion.cpp (+1-1)
  • (modified) flang/lib/Optimizer/Transforms/ConstantArgumentGlobalisation.cpp (+1-1)
  • (modified) flang/lib/Optimizer/Transforms/ControlFlowConverter.cpp (+3-3)
  • (modified) flang/lib/Optimizer/Transforms/MemoryAllocation.cpp (+1-1)
  • (modified) flang/lib/Optimizer/Transforms/PolymorphicOpConversion.cpp (+7-7)
  • (modified) flang/lib/Optimizer/Transforms/StackArrays.cpp (+4-5)
  • (modified) flang/tools/bbc/bbc.cpp (+2-2)
  • (modified) flang/tools/tco/tco.cpp (+1-1)
  • (renamed) llvm/include/llvm/Support/LogicalResult.h (+33-36)
  • (modified) mlir/docs/PDLL.md (+7-7)
  • (modified) mlir/docs/Tutorials/Toy/Ch-2.md (+3-3)
  • (modified) mlir/docs/Tutorials/Toy/Ch-3.md (+3-3)
  • (modified) mlir/docs/Tutorials/Toy/Ch-5.md (+1-1)
  • (modified) mlir/examples/standalone/lib/Standalone/StandalonePasses.cpp (-1)
  • (modified) mlir/examples/standalone/standalone-translate/standalone-translate.cpp (+1-2)
  • (modified) mlir/examples/toy/Ch2/mlir/Dialect.cpp (+3-4)
  • (modified) mlir/examples/toy/Ch2/mlir/MLIRGen.cpp (+4-5)
  • (modified) mlir/examples/toy/Ch3/mlir/Dialect.cpp (+3-4)
  • (modified) mlir/examples/toy/Ch3/mlir/MLIRGen.cpp (+4-5)
  • (modified) mlir/examples/toy/Ch3/mlir/ToyCombine.cpp (+1-2)
  • (modified) mlir/examples/toy/Ch3/toyc.cpp (-1)
  • (modified) mlir/examples/toy/Ch4/mlir/Dialect.cpp (+3-4)
  • (modified) mlir/examples/toy/Ch4/mlir/MLIRGen.cpp (+4-5)
  • (modified) mlir/examples/toy/Ch4/mlir/ToyCombine.cpp (+1-2)
  • (modified) mlir/examples/toy/Ch4/toyc.cpp (-1)
  • (modified) mlir/examples/toy/Ch5/mlir/Dialect.cpp (+3-4)
  • (modified) mlir/examples/toy/Ch5/mlir/LowerToAffineLoops.cpp (-1)
  • (modified) mlir/examples/toy/Ch5/mlir/MLIRGen.cpp (+4-5)
  • (modified) mlir/examples/toy/Ch5/mlir/ToyCombine.cpp (+1-2)
  • (modified) mlir/examples/toy/Ch5/toyc.cpp (-1)
  • (modified) mlir/examples/toy/Ch6/mlir/Dialect.cpp (+3-4)
  • (modified) mlir/examples/toy/Ch6/mlir/LowerToAffineLoops.cpp (-1)
  • (modified) mlir/examples/toy/Ch6/mlir/LowerToLLVM.cpp (-1)
  • (modified) mlir/examples/toy/Ch6/mlir/MLIRGen.cpp (+4-5)
  • (modified) mlir/examples/toy/Ch6/mlir/ToyCombine.cpp (+1-2)
  • (modified) mlir/examples/toy/Ch6/toyc.cpp (-1)
  • (modified) mlir/examples/toy/Ch7/mlir/Dialect.cpp (+6-7)
  • (modified) mlir/examples/toy/Ch7/mlir/LowerToAffineLoops.cpp (-1)
  • (modified) mlir/examples/toy/Ch7/mlir/LowerToLLVM.cpp (-1)
  • (modified) mlir/examples/toy/Ch7/mlir/MLIRGen.cpp (+5-6)
  • (modified) mlir/examples/toy/Ch7/mlir/ToyCombine.cpp (+1-2)
  • (modified) mlir/examples/toy/Ch7/toyc.cpp (-1)
  • (modified) mlir/examples/transform-opt/mlir-transform-opt.cpp (+5-5)
  • (modified) mlir/examples/transform/Ch4/lib/MyExtension.cpp (+1-1)
  • (modified) mlir/include/mlir/Analysis/FlatLinearValueConstraints.h (-1)
  • (modified) mlir/include/mlir/Bytecode/BytecodeImplementation.h (-1)
  • (modified) mlir/include/mlir/Bytecode/BytecodeOpInterface.h (-1)
  • (modified) mlir/include/mlir/Bytecode/BytecodeReader.h (-1)
  • (modified) mlir/include/mlir/Bytecode/BytecodeReaderConfig.h (-1)
  • (modified) mlir/include/mlir/CAPI/Support.h (+3-3)
  • (modified) mlir/include/mlir/Conversion/AffineToStandard/AffineToStandard.h (-1)
  • (modified) mlir/include/mlir/Conversion/ConvertToLLVM/ToLLVMInterface.h (-1)
  • (modified) mlir/include/mlir/Conversion/FuncToLLVM/ConvertFuncToLLVM.h (-1)
  • (modified) mlir/include/mlir/Conversion/GPUCommon/GPUCommonPass.h (-1)
  • (modified) mlir/include/mlir/Conversion/SCFToGPU/SCFToGPU.h (-1)
  • (modified) mlir/include/mlir/Conversion/VectorToGPU/VectorToGPU.h (-1)
  • (modified) mlir/include/mlir/Debug/CLOptionsSetup.h (-1)
  • (modified) mlir/include/mlir/Dialect/AMDGPU/Utils/Chipset.h (+1-1)
  • (modified) mlir/include/mlir/Dialect/Affine/Analysis/AffineStructures.h (-1)
  • (modified) mlir/include/mlir/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.h (+1-1)
  • (modified) mlir/include/mlir/Dialect/Affine/LoopUtils.h (-1)
  • (modified) mlir/include/mlir/Dialect/Affine/Transforms/Transforms.h (-1)
  • (modified) mlir/include/mlir/Dialect/Affine/Utils.h (-2)
  • (modified) mlir/include/mlir/Dialect/Arith/Transforms/Transforms.h (-1)
  • (modified) mlir/include/mlir/Dialect/Bufferization/IR/BufferizableOpInterface.td (+4-4)
  • (modified) mlir/include/mlir/Dialect/Bufferization/Transforms/OneShotModuleBufferize.h (+11-8)
  • (modified) mlir/include/mlir/Dialect/GPU/IR/CompilationAttrInterfaces.td (+2-2)
  • (modified) mlir/include/mlir/Dialect/GPU/Transforms/ParallelLoopMapper.h (-1)
  • (modified) mlir/include/mlir/Dialect/GPU/Transforms/Utils.h (-1)
  • (modified) mlir/include/mlir/Dialect/IRDL/IR/IRDLInterfaces.h (-1)
  • (modified) mlir/include/mlir/Dialect/IRDL/IR/IRDLTraits.h (-1)
  • (modified) mlir/include/mlir/Dialect/IRDL/IRDLLoading.h (+6-2)
  • (modified) mlir/include/mlir/Dialect/IRDL/IRDLVerifiers.h (-1)
  • (modified) mlir/include/mlir/Dialect/Linalg/TransformOps/GPUHeuristics.h (-1)
  • (modified) mlir/include/mlir/Dialect/Linalg/TransformOps/Syntax.h (-1)
  • (modified) mlir/include/mlir/Dialect/Linalg/Transforms/Transforms.h (-1)
  • (modified) mlir/include/mlir/Dialect/MemRef/Transforms/Transforms.h (+1-1)
  • (modified) mlir/include/mlir/Dialect/Mesh/Transforms/Spmdization.h (-1)
  • (modified) mlir/include/mlir/Dialect/NVGPU/Transforms/Transforms.h (+1-2)
  • (modified) mlir/include/mlir/Dialect/OpenACCMPCommon/Interfaces/AtomicInterfaces.td (+12-12)
  • (modified) mlir/include/mlir/Dialect/Polynomial/IR/Polynomial.h (-1)
  • (modified) mlir/include/mlir/Dialect/SCF/Transforms/Transforms.h (-2)
  • (modified) mlir/include/mlir/Dialect/SCF/Utils/AffineCanonicalizationUtils.h (-2)
  • (modified) mlir/include/mlir/Dialect/SCF/Utils/Utils.h (-1)
  • (modified) mlir/include/mlir/Dialect/SparseTensor/IR/SparseTensorInterfaces.td (+1-1)
  • (modified) mlir/include/mlir/Dialect/Transform/Interfaces/TransformInterfaces.h (+1-2)
  • (modified) mlir/include/mlir/Dialect/Transform/Interfaces/TransformInterfaces.td (+1-1)
  • (modified) mlir/include/mlir/Dialect/Transform/Transforms/TransformInterpreterUtils.h (-1)
  • (modified) mlir/include/mlir/Dialect/Vector/Transforms/VectorRewritePatterns.h (-1)
  • (modified) mlir/include/mlir/ExecutionEngine/JitRunner.h (+3-3)
  • (modified) mlir/include/mlir/IR/Action.h (-1)
  • (modified) mlir/include/mlir/IR/AffineExpr.h (-1)
  • (modified) mlir/include/mlir/IR/AffineExprVisitor.h (+1-1)
  • (modified) mlir/include/mlir/IR/AffineMap.h (-1)
  • (modified) mlir/include/mlir/IR/BuiltinAttributeInterfaces.h (-1)
  • (modified) mlir/include/mlir/IR/BuiltinAttributeInterfaces.td (+1-1)
  • (modified) mlir/include/mlir/IR/Diagnostics.h (-1)
  • (modified) mlir/include/mlir/IR/Dialect.h (-3)
  • (modified) mlir/include/mlir/IR/EnumAttr.td (+2-2)
  • (modified) mlir/include/mlir/IR/ExtensibleDialect.h (-1)
  • (modified) mlir/include/mlir/IR/OperationSupport.h (-1)
  • (modified) mlir/include/mlir/IR/StorageUniquerSupport.h (-1)
  • (modified) mlir/include/mlir/IR/SymbolInterfaces.td (+2-2)
  • (modified) mlir/include/mlir/IR/TensorEncoding.td (+1-1)
  • (modified) mlir/include/mlir/IR/Verifier.h (+2-1)
  • (modified) mlir/include/mlir/IR/Visitors.h (-1)
  • (modified) mlir/include/mlir/Interfaces/DataLayoutInterfaces.td (+5-5)
  • (modified) mlir/include/mlir/Interfaces/FoldInterfaces.h (-1)
  • (modified) mlir/include/mlir/Interfaces/FunctionInterfaces.td (+2-2)
  • (modified) mlir/include/mlir/Interfaces/InferTypeOpInterface.td (+10-10)
  • (modified) mlir/include/mlir/Interfaces/LoopLikeInterface.td (+1-1)
  • (modified) mlir/include/mlir/Interfaces/MemorySlotInterfaces.td (+3-3)
  • (modified) mlir/include/mlir/Interfaces/TilingInterface.td (+10-10)
  • (modified) mlir/include/mlir/Pass/Pass.h (-1)
  • (modified) mlir/include/mlir/Pass/PassManager.h (-1)
  • (modified) mlir/include/mlir/Pass/PassOptions.h (-1)
  • (modified) mlir/include/mlir/Query/Query.h (+6-7)
  • (modified) mlir/include/mlir/Reducer/ReductionNode.h (-1)
  • (modified) mlir/include/mlir/Support/LLVM.h (+13-1)
  • (modified) mlir/include/mlir/Support/StorageUniquer.h (-1)
  • (modified) mlir/include/mlir/Support/ToolUtilities.h (-2)
  • (modified) mlir/include/mlir/Target/Cpp/CppEmitter.h (-1)
  • (modified) mlir/include/mlir/Target/LLVM/ROCDL/Utils.h (+1)
  • (modified) mlir/include/mlir/Target/LLVMIR/LLVMImportInterface.h (-1)
  • (modified) mlir/include/mlir/Target/LLVMIR/LLVMTranslationInterface.h (-1)
  • (modified) mlir/include/mlir/Target/SPIRV/Serialization.h (-1)
  • (modified) mlir/include/mlir/Tools/PDLL/AST/Diagnostic.h (-1)
  • (modified) mlir/include/mlir/Tools/PDLL/CodeGen/MLIRGen.h (-2)
  • (modified) mlir/include/mlir/Tools/PDLL/Parser/Parser.h (+1-1)
  • (modified) mlir/include/mlir/Tools/lsp-server-support/CompilationDatabase.h (+1)
  • (modified) mlir/include/mlir/Tools/lsp-server-support/Protocol.h (-3)
  • (modified) mlir/include/mlir/Tools/lsp-server-support/Transport.h (-1)
  • (modified) mlir/include/mlir/Tools/mlir-lsp-server/MlirLspServerMain.h (+6-3)
  • (modified) mlir/include/mlir/Tools/mlir-opt/MlirOptMain.h (-1)
  • (modified) mlir/include/mlir/Tools/mlir-pdll-lsp-server/MlirPdllLspServerMain.h (+4-2)
  • (modified) mlir/include/mlir/Tools/mlir-query/MlirQueryMain.h (+1-1)
  • (modified) mlir/include/mlir/Tools/mlir-reduce/MlirReduceMain.h (+1-1)
  • (modified) mlir/include/mlir/Tools/mlir-translate/MlirTranslateMain.h (+1-1)
  • (modified) mlir/include/mlir/Tools/tblgen-lsp-server/TableGenLspServerMain.h (+4-3)
  • (modified) mlir/include/mlir/Transforms/HomomorphismSimplification.h (-1)
  • (modified) mlir/include/mlir/Transforms/Inliner.h (-1)
  • (modified) mlir/include/mlir/Transforms/LocationSnapshot.h (-1)
  • (modified) mlir/include/mlir/Transforms/SROA.h (+1-1)
  • (modified) mlir/lib/Analysis/AliasAnalysis/LocalAliasAnalysis.cpp (-1)
  • (modified) mlir/lib/Analysis/DataFlow/ConstantPropagationAnalysis.cpp (-1)
  • (modified) mlir/lib/Analysis/DataFlow/DeadCodeAnalysis.cpp (-1)
  • (modified) mlir/lib/Analysis/DataFlow/DenseAnalysis.cpp (-1)
  • (modified) mlir/lib/Analysis/DataFlow/SparseAnalysis.cpp (-1)
  • (modified) mlir/lib/Analysis/DataFlowFramework.cpp (-1)
  • (modified) mlir/lib/Analysis/FlatLinearValueConstraints.cpp (-1)
  • (modified) mlir/lib/AsmParser/AffineParser.cpp (-1)
  • (modified) mlir/lib/AsmParser/AsmParserState.cpp (-1)
  • (modified) mlir/lib/AsmParser/DialectSymbolParser.cpp (-1)
  • (modified) mlir/lib/AsmParser/LocationParser.cpp (-1)
  • (modified) mlir/lib/AsmParser/Parser.cpp (-1)
  • (modified) mlir/lib/AsmParser/TypeParser.cpp (-1)
  • (modified) mlir/lib/Bytecode/Reader/BytecodeReader.cpp (-1)
  • (modified) mlir/lib/Bytecode/Writer/BytecodeWriter.cpp (-1)
  • (modified) mlir/lib/CAPI/IR/BuiltinTypes.cpp (-1)
  • (modified) mlir/lib/Conversion/ArithToAMDGPU/ArithToAMDGPU.cpp (-1)
  • (modified) mlir/lib/Conversion/ArithToEmitC/ArithToEmitC.cpp (-1)
  • (modified) mlir/lib/Conversion/BufferizationToMemRef/BufferizationToMemRef.cpp (-1)
  • (modified) mlir/lib/Conversion/ControlFlowToSPIRV/ControlFlowToSPIRV.cpp (-1)
  • (modified) mlir/lib/Conversion/FuncToLLVM/FuncToLLVM.cpp (-1)
  • (modified) mlir/lib/Conversion/FuncToSPIRV/FuncToSPIRV.cpp (-1)
  • (modified) mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRV.cpp (-1)
  • (modified) mlir/lib/Conversion/MemRefToSPIRV/MemRefToSPIRV.cpp (-1)
  • (modified) mlir/lib/Conversion/NVVMToLLVM/NVVMToLLVM.cpp (-1)
  • (modified) mlir/lib/Conversion/SPIRVToLLVM/SPIRVToLLVM.cpp (-1)
  • (modified) mlir/lib/Conversion/TensorToLinalg/TensorToLinalg.cpp (-1)
  • (modified) mlir/lib/Conversion/TensorToSPIRV/TensorToSPIRV.cpp (-1)
  • (modified) mlir/lib/Conversion/VectorToGPU/VectorToGPU.cpp (-1)
  • (modified) mlir/lib/Conversion/VectorToSPIRV/VectorToSPIRV.cpp (-1)
  • (modified) mlir/lib/Dialect/Affine/Transforms/AffineScalarReplacement.cpp (-1)
  • (modified) mlir/lib/Dialect/Arith/IR/ArithOps.cpp (-1)
  • (modified) mlir/lib/Dialect/Arith/Transforms/EmulateNarrowType.cpp (-1)
  • (modified) mlir/lib/Dialect/Arith/Transforms/EmulateWideInt.cpp (-1)
  • (modified) mlir/lib/Dialect/Arith/Transforms/IntNarrowing.cpp (-1)
  • (modified) mlir/lib/Dialect/ArmNeon/Transforms/LowerContractionToSMMLAPattern.cpp (-1)
  • (modified) mlir/lib/Dialect/Bufferization/Transforms/LowerDeallocations.cpp (-1)
  • (modified) mlir/lib/Dialect/GPU/IR/GPUDialect.cpp (-1)
  • (modified) mlir/lib/Dialect/GPU/Transforms/SubgroupReduceLowering.cpp (-1)
  • (modified) mlir/lib/Dialect/IRDL/IR/IRDL.cpp (-1)
  • (modified) mlir/lib/Dialect/IRDL/IRDLLoading.cpp (-1)
  • (modified) mlir/lib/Dialect/IRDL/IRDLVerifiers.cpp (-1)
  • (modified) mlir/lib/Dialect/LLVMIR/IR/BasicPtxBuilderInterface.cpp (-1)
  • (modified) mlir/lib/Dialect/LLVMIR/IR/NVVMDialect.cpp (-1)
  • (modified) mlir/lib/Dialect/Linalg/Transforms/MeshShardingInterfaceImpl.cpp (-1)
  • (modified) mlir/lib/Dialect/Linalg/Transforms/TransposeConv2D.cpp (-1)
  • (modified) mlir/lib/Dialect/MemRef/IR/MemRefMemorySlot.cpp (-1)
  • (modified) mlir/lib/Dialect/MemRef/Transforms/EmulateNarrowType.cpp (-1)
  • (modified) mlir/lib/Dialect/Mesh/IR/MeshOps.cpp (-1)
  • (modified) mlir/lib/Dialect/Mesh/Interfaces/ShardingInterface.cpp (-1)
  • (modified) mlir/lib/Dialect/Mesh/Transforms/ShardingPropagation.cpp (-1)
  • (modified) mlir/lib/Dialect/Mesh/Transforms/Simplifications.cpp (-1)
  • (modified) mlir/lib/Dialect/Mesh/Transforms/Spmdization.cpp (-1)
  • (modified) mlir/lib/Dialect/NVGPU/Transforms/MmaSyncTF32Transform.cpp (-1)
  • (modified) mlir/lib/Dialect/NVGPU/Transforms/OptimizeSharedMemory.cpp (+1-2)
  • (modified) mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp (-1)
  • (modified) mlir/lib/Dialect/Polynomial/IR/Polynomial.cpp (-1)
  • (modified) mlir/lib/Dialect/Polynomial/IR/PolynomialAttributes.cpp (-1)
  • (modified) mlir/lib/Dialect/Polynomial/IR/PolynomialDialect.cpp (-1)
  • (modified) mlir/lib/Dialect/Polynomial/IR/PolynomialOps.cpp (-1)
  • (modified) mlir/lib/Dialect/Quant/IR/QuantDialectBytecode.cpp (-1)
  • (modified) mlir/lib/Dialect/SPIRV/IR/SPIRVOps.cpp (-1)
  • (modified) mlir/lib/Dialect/SPIRV/Transforms/SPIRVWebGPUTransforms.cpp (-1)
  • (modified) mlir/lib/Dialect/Tosa/IR/TosaOps.cpp (+1-1)
  • (modified) mlir/lib/Dialect/Tosa/Transforms/TosaFolders.cpp (-1)
  • (modified) mlir/lib/Dialect/Transform/Interfaces/TransformInterfaces.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorBitCast.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorBroadcast.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorContract.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorGather.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorInterleave.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorScan.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorShapeCast.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorTranspose.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/VectorLinearize.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp (-1)
  • (modified) mlir/lib/IR/AffineMap.cpp (-1)
  • (modified) mlir/lib/IR/ExtensibleDialect.cpp (-1)
  • (modified) mlir/lib/Query/Query.cpp (+5-11)
  • (modified) mlir/lib/Support/ToolUtilities.cpp (-1)
  • (modified) mlir/lib/TableGen/CodeGenHelpers.cpp (+6-6)
  • (modified) mlir/lib/Target/LLVMIR/Dialect/GPU/SelectObjectAttr.cpp (+2-2)
  • (modified) mlir/lib/Target/LLVMIR/Dialect/NVVM/NVVMToLLVMIRTranslation.cpp (-1)
  • (modified) mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp (-1)
  • (modified) mlir/lib/Target/LLVMIR/ModuleTranslation.cpp (-1)
  • (modified) mlir/lib/Target/SPIRV/Deserialization/Deserializer.cpp (-1)
  • (modified) mlir/lib/Target/SPIRV/Serialization/SerializeOps.cpp (-1)
  • (modified) mlir/lib/Target/SPIRV/Serialization/Serializer.cpp (-1)
  • (modified) mlir/lib/Tools/PDLL/CodeGen/CPPGen.cpp (+1-1)
  • (modified) mlir/lib/Tools/PDLL/Parser/Lexer.cpp (-1)
  • (modified) mlir/lib/Tools/PDLL/Parser/Lexer.h (-2)
  • (modified) mlir/lib/Tools/PDLL/Parser/Parser.cpp (-1)
  • (modified) mlir/lib/Tools/lsp-server-support/Protocol.cpp (-1)
  • (modified) mlir/lib/Tools/mlir-lsp-server/LSPServer.h (+5-2)
  • (modified) mlir/lib/Tools/mlir-opt/MlirOptMain.cpp (-1)
  • (modified) mlir/lib/Tools/mlir-pdll-lsp-server/LSPServer.h (+5-2)
  • (modified) mlir/lib/Tools/mlir-pdll-lsp-server/PDLLServer.h (+2-1)
  • (modified) mlir/lib/Tools/mlir-query/MlirQueryMain.cpp (+1-2)
  • (modified) mlir/lib/Tools/mlir-reduce/MlirReduceMain.cpp (-1)
  • (modified) mlir/lib/Tools/mlir-translate/MlirTranslateMain.cpp (-1)
  • (modified) mlir/lib/Tools/tblgen-lsp-server/LSPServer.h (+5-3)
  • (modified) mlir/lib/Tools/tblgen-lsp-server/TableGenServer.cpp (-4)
  • (modified) mlir/lib/Tools/tblgen-lsp-server/TableGenServer.h (+2-1)
  • (modified) mlir/test/lib/Analysis/DataFlow/TestLivenessAnalysis.cpp (-1)
  • (modified) mlir/test/lib/Dialect/ArmNeon/TestLowerToArmNeon.cpp (-1)
  • (modified) mlir/test/lib/Dialect/Mesh/TestOpLowering.cpp (-1)
  • (modified) mlir/test/lib/Dialect/Mesh/TestReshardingSpmdization.cpp (-1)
  • (modified) mlir/test/lib/Dialect/Test/TestAttributes.cpp (-1)
  • (modified) mlir/test/lib/Dialect/Test/TestDialect.cpp (-1)
  • (modified) mlir/test/lib/Dialect/Test/TestOpDefs.cpp (+1-1)
  • (modified) mlir/test/lib/Dialect/Test/TestOps.h (+5-5)
  • (modified) mlir/test/lib/Dialect/Test/TestOps.td (+6-6)
  • (modified) mlir/test/lib/Dialect/Test/TestOpsSyntax.cpp (+1-1)
  • (modified) mlir/test/lib/Dialect/Test/TestOpsSyntax.td (+4-4)
  • (modified) mlir/test/lib/Dialect/Test/TestTypeDefs.td (+1-1)
  • (modified) mlir/test/lib/Dialect/Test/TestTypes.h (+2-2)
  • (modified) mlir/test/mlir-pdll/CodeGen/CPP/general.pdll (+1-1)
  • (modified) mlir/test/mlir-tblgen/attrdefs.td (+1-1)
  • (modified) mlir/test/mlir-tblgen/constraint-unique.td (+9-9)
  • (modified) mlir/test/mlir-tblgen/interfaces-as-constraints.td (+4-4)
  • (modified) mlir/test/mlir-tblgen/op-attribute.td (+2-2)
  • (modified) mlir/test/mlir-tblgen/op-decl-and-defs.td (+5-5)
  • (modified) mlir/test/mlir-tblgen/predicate.td (+3-3)
  • (modified) mlir/test/mlir-tblgen/rewriter-static-matcher.td (+3-3)
  • (modified) mlir/test/mlir-tblgen/typedefs.td (+1-1)
  • (modified) mlir/test/python/python_test_ops.td (+3-3)
  • (modified) mlir/tools/mlir-pdll-lsp-server/mlir-pdll-lsp-server.cpp (+1-1)
diff --git a/flang/include/flang/Optimizer/CodeGen/FIROpPatterns.h b/flang/include/flang/Optimizer/CodeGen/FIROpPatterns.h
index ac095664f6188..91b2025176770 100644
--- a/flang/include/flang/Optimizer/CodeGen/FIROpPatterns.h
+++ b/flang/include/flang/Optimizer/CodeGen/FIROpPatterns.h
@@ -205,10 +205,10 @@ class FIROpConversion : public ConvertFIRToLLVMPattern {
     rewrite(mlir::cast<SourceOp>(op),
             OpAdaptor(operands, mlir::cast<SourceOp>(op)), rewriter);
   }
-  mlir::LogicalResult match(mlir::Operation *op) const final {
+  llvm::LogicalResult match(mlir::Operation *op) const final {
     return match(mlir::cast<SourceOp>(op));
   }
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(mlir::Operation *op, mlir::ArrayRef<mlir::Value> operands,
                   mlir::ConversionPatternRewriter &rewriter) const final {
     return matchAndRewrite(mlir::cast<SourceOp>(op),
@@ -218,14 +218,14 @@ class FIROpConversion : public ConvertFIRToLLVMPattern {
 
   /// Rewrite and Match methods that operate on the SourceOp type. These must be
   /// overridden by the derived pattern class.
-  virtual mlir::LogicalResult match(SourceOp op) const {
+  virtual llvm::LogicalResult match(SourceOp op) const {
     llvm_unreachable("must override match or matchAndRewrite");
   }
   virtual void rewrite(SourceOp op, OpAdaptor adaptor,
                        mlir::ConversionPatternRewriter &rewriter) const {
     llvm_unreachable("must override rewrite or matchAndRewrite");
   }
-  virtual mlir::LogicalResult
+  virtual llvm::LogicalResult
   matchAndRewrite(SourceOp op, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const {
     if (mlir::failed(match(op)))
@@ -246,14 +246,14 @@ class FIROpAndTypeConversion : public FIROpConversion<FromOp> {
   using FIROpConversion<FromOp>::FIROpConversion;
   using OpAdaptor = typename FromOp::Adaptor;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(FromOp op, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const final {
     mlir::Type ty = this->convertType(op.getType());
     return doRewrite(op, ty, adaptor, rewriter);
   }
 
-  virtual mlir::LogicalResult
+  virtual llvm::LogicalResult
   doRewrite(FromOp addr, mlir::Type ty, OpAdaptor adaptor,
             mlir::ConversionPatternRewriter &rewriter) const = 0;
 };
diff --git a/flang/include/flang/Optimizer/CodeGen/TypeConverter.h b/flang/include/flang/Optimizer/CodeGen/TypeConverter.h
index 58803a5cc4044..ece3e4e073f68 100644
--- a/flang/include/flang/Optimizer/CodeGen/TypeConverter.h
+++ b/flang/include/flang/Optimizer/CodeGen/TypeConverter.h
@@ -60,7 +60,7 @@ class LLVMTypeConverter : public mlir::LLVMTypeConverter {
   mlir::Type indexType() const;
 
   // fir.type<name(p : TY'...){f : TY...}>  -->  llvm<"%name = { ty... }">
-  std::optional<mlir::LogicalResult>
+  std::optional<llvm::LogicalResult>
   convertRecordType(fir::RecordType derived,
                     llvm::SmallVectorImpl<mlir::Type> &results);
 
diff --git a/flang/include/flang/Optimizer/Dialect/FirAliasTagOpInterface.h b/flang/include/flang/Optimizer/Dialect/FirAliasTagOpInterface.h
index f2d5b39acf3a7..1e3728e735145 100644
--- a/flang/include/flang/Optimizer/Dialect/FirAliasTagOpInterface.h
+++ b/flang/include/flang/Optimizer/Dialect/FirAliasTagOpInterface.h
@@ -16,10 +16,10 @@
 
 #include "mlir/IR/OpDefinition.h"
 #include "mlir/IR/Operation.h"
-#include "mlir/Support/LogicalResult.h"
+#include "llvm/Support/LogicalResult.h"
 
 namespace fir::detail {
-mlir::LogicalResult verifyFirAliasTagOpInterface(mlir::Operation *op);
+llvm::LogicalResult verifyFirAliasTagOpInterface(mlir::Operation *op);
 } // namespace fir::detail
 
 #include "flang/Optimizer/Dialect/FirAliasTagOpInterface.h.inc"
diff --git a/flang/include/flang/Optimizer/Dialect/FortranVariableInterface.td b/flang/include/flang/Optimizer/Dialect/FortranVariableInterface.td
index 3f78a93a2515e..926e00ca04340 100644
--- a/flang/include/flang/Optimizer/Dialect/FortranVariableInterface.td
+++ b/flang/include/flang/Optimizer/Dialect/FortranVariableInterface.td
@@ -192,7 +192,7 @@ def fir_FortranVariableOpInterface : OpInterface<"FortranVariableOpInterface"> {
     }
 
     /// Interface verifier imlementation for declare operations.
-    mlir::LogicalResult verifyDeclareLikeOpImpl(mlir::Value memRef);
+    llvm::LogicalResult verifyDeclareLikeOpImpl(mlir::Value memRef);
 
   }];
 
diff --git a/flang/include/flang/Optimizer/Dialect/Support/KindMapping.h b/flang/include/flang/Optimizer/Dialect/Support/KindMapping.h
index 138123b7b48ba..083526fcbac94 100644
--- a/flang/include/flang/Optimizer/Dialect/Support/KindMapping.h
+++ b/flang/include/flang/Optimizer/Dialect/Support/KindMapping.h
@@ -124,7 +124,7 @@ class KindMapping {
 private:
   MatchResult badMapString(const llvm::Twine &ptr);
   MatchResult parse(llvm::StringRef kindMap);
-  mlir::LogicalResult setDefaultKinds(llvm::ArrayRef<KindTy> defs);
+  llvm::LogicalResult setDefaultKinds(llvm::ArrayRef<KindTy> defs);
 
   mlir::MLIRContext *context;
   llvm::DenseMap<std::pair<char, KindTy>, Bitsize> intMap;
diff --git a/flang/include/flang/Optimizer/HLFIR/HLFIROps.td b/flang/include/flang/Optimizer/HLFIR/HLFIROps.td
index e9915e899c2c9..fdf0db9d3c75d 100644
--- a/flang/include/flang/Optimizer/HLFIR/HLFIROps.td
+++ b/flang/include/flang/Optimizer/HLFIR/HLFIROps.td
@@ -733,7 +733,7 @@ def hlfir_AssociateOp : hlfir_Op<"associate", [AttrSizedOperandSegments,
       CArg<"mlir::Value", "{}">:$shape, CArg<"mlir::ValueRange", "{}">:$typeparams,
       CArg<"fir::FortranVariableFlagsAttr", "{}">:$fortran_attrs)>,
     OpBuilder<(ins "mlir::Value":$memref, CArg<"mlir::Value", "{}">:$shape,
-      CArg<"mlir::ValueRange", "{}">:$typeparams, 
+      CArg<"mlir::ValueRange", "{}">:$typeparams,
       CArg<"fir::FortranVariableFlagsAttr", "{}">:$fortran_attrs,
       CArg<"llvm::ArrayRef<mlir::NamedAttribute>", "{}">:$attributes)>];
 
@@ -1258,7 +1258,7 @@ def hlfir_OrderedAssignmentTreeOpInterface : OpInterface<"OrderedAssignmentTreeO
 
   let extraClassDeclaration = [{
     /// Interface verifier imlementation.
-    mlir::LogicalResult verifyImpl();
+    llvm::LogicalResult verifyImpl();
 
     mlir::Block* getSubTreeBlock() {
       mlir::Region* region = getSubTreeRegion();
@@ -1733,8 +1733,8 @@ def hlfir_CharExtremumOp : hlfir_Op<"char_extremum",
     [DeclareOpInterfaceMethods<MemoryEffectsOpInterface>]> {
   let summary = "Find max/min from given character strings";
   let description = [{
-    Find the lexicographical minimum or maximum of two or more character 
-    strings of the same character kind and return the string with the lexicographical 
+    Find the lexicographical minimum or maximum of two or more character
+    strings of the same character kind and return the string with the lexicographical
     minimum or maximum number of characters. Example:
 
     %0 = hlfir.char_extremum min, %arg0, %arg1 : (!fir.ref<!fir.char<1,10>>, !fir.ref<!fir.char<1,20>>) -> !hlfir.expr<!fir.char<1,10>>
diff --git a/flang/lib/Optimizer/CodeGen/CodeGen.cpp b/flang/lib/Optimizer/CodeGen/CodeGen.cpp
index 5f35825783c51..7483acfcd1ca7 100644
--- a/flang/lib/Optimizer/CodeGen/CodeGen.cpp
+++ b/flang/lib/Optimizer/CodeGen/CodeGen.cpp
@@ -113,7 +113,7 @@ namespace {
 struct AddrOfOpConversion : public fir::FIROpConversion<fir::AddrOfOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::AddrOfOp addr, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     auto ty = convertType(addr.getType());
@@ -174,7 +174,7 @@ namespace {
 struct DeclareOpConversion : public fir::FIROpConversion<fir::cg::XDeclareOp> {
 public:
   using FIROpConversion::FIROpConversion;
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::cg::XDeclareOp declareOp, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     auto memRef = adaptor.getOperands()[0];
@@ -197,7 +197,7 @@ namespace {
 struct AllocaOpConversion : public fir::FIROpConversion<fir::AllocaOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::AllocaOp alloc, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::ValueRange operands = adaptor.getOperands();
@@ -294,7 +294,7 @@ namespace {
 struct BoxAddrOpConversion : public fir::FIROpConversion<fir::BoxAddrOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxAddrOp boxaddr, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value a = adaptor.getOperands()[0];
@@ -316,7 +316,7 @@ struct BoxAddrOpConversion : public fir::FIROpConversion<fir::BoxAddrOp> {
 struct BoxCharLenOpConversion : public fir::FIROpConversion<fir::BoxCharLenOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxCharLenOp boxCharLen, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value boxChar = adaptor.getOperands()[0];
@@ -339,7 +339,7 @@ struct BoxCharLenOpConversion : public fir::FIROpConversion<fir::BoxCharLenOp> {
 struct BoxDimsOpConversion : public fir::FIROpConversion<fir::BoxDimsOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxDimsOp boxdims, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     llvm::SmallVector<mlir::Type, 3> resultTypes = {
@@ -361,7 +361,7 @@ struct BoxDimsOpConversion : public fir::FIROpConversion<fir::BoxDimsOp> {
 struct BoxEleSizeOpConversion : public fir::FIROpConversion<fir::BoxEleSizeOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxEleSizeOp boxelesz, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value box = adaptor.getOperands()[0];
@@ -379,7 +379,7 @@ struct BoxEleSizeOpConversion : public fir::FIROpConversion<fir::BoxEleSizeOp> {
 struct BoxIsAllocOpConversion : public fir::FIROpConversion<fir::BoxIsAllocOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxIsAllocOp boxisalloc, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value box = adaptor.getOperands()[0];
@@ -397,7 +397,7 @@ struct BoxIsAllocOpConversion : public fir::FIROpConversion<fir::BoxIsAllocOp> {
 struct BoxIsArrayOpConversion : public fir::FIROpConversion<fir::BoxIsArrayOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxIsArrayOp boxisarray, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value a = adaptor.getOperands()[0];
@@ -416,7 +416,7 @@ struct BoxIsArrayOpConversion : public fir::FIROpConversion<fir::BoxIsArrayOp> {
 struct BoxIsPtrOpConversion : public fir::FIROpConversion<fir::BoxIsPtrOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxIsPtrOp boxisptr, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value box = adaptor.getOperands()[0];
@@ -434,7 +434,7 @@ struct BoxIsPtrOpConversion : public fir::FIROpConversion<fir::BoxIsPtrOp> {
 struct BoxRankOpConversion : public fir::FIROpConversion<fir::BoxRankOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxRankOp boxrank, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value a = adaptor.getOperands()[0];
@@ -456,7 +456,7 @@ struct BoxProcHostOpConversion
     : public fir::FIROpConversion<fir::BoxProcHostOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxProcHostOp boxprochost, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     TODO(boxprochost.getLoc(), "fir.boxproc_host codegen");
@@ -470,7 +470,7 @@ struct BoxTypeDescOpConversion
     : public fir::FIROpConversion<fir::BoxTypeDescOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxTypeDescOp boxtypedesc, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value box = adaptor.getOperands()[0];
@@ -488,7 +488,7 @@ struct BoxTypeCodeOpConversion
     : public fir::FIROpConversion<fir::BoxTypeCodeOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxTypeCodeOp op, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value box = adaptor.getOperands()[0];
@@ -506,7 +506,7 @@ struct BoxTypeCodeOpConversion
 struct StringLitOpConversion : public fir::FIROpConversion<fir::StringLitOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::StringLitOp constop, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     auto ty = convertType(constop.getType());
@@ -547,7 +547,7 @@ struct StringLitOpConversion : public fir::FIROpConversion<fir::StringLitOp> {
 struct CallOpConversion : public fir::FIROpConversion<fir::CallOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::CallOp call, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     llvm::SmallVector<mlir::Type> resultTys;
@@ -578,7 +578,7 @@ namespace {
 struct CmpcOpConversion : public fir::FIROpConversion<fir::CmpcOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::CmpcOp cmp, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::ValueRange operands = adaptor.getOperands();
@@ -616,7 +616,7 @@ struct CmpcOpConversion : public fir::FIROpConversion<fir::CmpcOp> {
 struct ConstcOpConversion : public fir::FIROpConversion<fir::ConstcOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::ConstcOp conc, OpAdaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Location loc = conc.getLoc();
@@ -647,7 +647,7 @@ struct ConvertOpConversion : public fir::FIROpConversion<fir::ConvertOp> {
     return mlir::isa<mlir::FloatType>(ty);
   }
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::ConvertOp convert, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     auto fromFirTy = convert.getValue().getType();
@@ -814,7 +814,7 @@ struct ConvertOpConversion : public fir::FIROpConversion<fir::ConvertOp> {
 struct TypeInfoOpConversion : public fir::FIROpConversion<fir::TypeInfoOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::TypeInfoOp op, OpAdaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     rewriter.eraseOp(op);
@@ -827,7 +827,7 @@ struct TypeInfoOpConversion : public fir::FIROpConversion<fir::TypeInfoOp> {
 struct DTEntryOpConversion : public fir::FIROpConversion<fir::DTEntryOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::DTEntryOp op, OpAdaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     rewriter.eraseOp(op);
@@ -839,7 +839,7 @@ struct DTEntryOpConversion : public fir::FIROpConversion<fir::DTEntryOp> {
 struct GlobalLenOpConversion : public fir::FIROpConversion<fir::GlobalLenOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::GlobalLenOp globalLen, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     TODO(globalLen.getLoc(), "fir.global_len codegen");
@@ -853,7 +853,7 @@ struct LenParamIndexOpConversion
   using FIROpConversion::FIROpConversion;
 
   // FIXME: this should be specialized by the runtime target
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::LenParamIndexOp lenp, OpAdaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     TODO(lenp.getLoc(), "fir.len_param_index codegen");
@@ -867,7 +867,7 @@ struct LenParamIndexOpConversion
 struct EmboxCharOpConversion : public fir::FIROpConversion<fir::EmboxCharOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::EmboxCharOp emboxChar, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::ValueRange operands = adaptor.getOperands();
@@ -960,7 +960,7 @@ namespace {
 struct AllocMemOpConversion : public fir::FIROpConversion<fir::AllocMemOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::AllocMemOp heap, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Type heapTy = heap.getType();
@@ -1030,7 +1030,7 @@ namespace {
 struct FreeMemOpConversion : public fir::FIROpConversion<fir::FreeMemOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::FreeMemOp freemem, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Location loc = freemem.getLoc();
@@ -1481,7 +1481,7 @@ computeTripletExtent(mlir::ConversionPatternRewriter &rewriter,
 struct EmboxOpConversion : public EmboxCommonConversion<fir::EmboxOp> {
   using EmboxCommonConversion::EmboxCommonConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::EmboxOp embox, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::ValueRange operands = adaptor.getOperands();
@@ -1513,7 +1513,7 @@ struct EmboxOpConversion : public EmboxCommonConversion<fir::EmboxOp> {
 struct XEmboxOpConversion : public EmboxCommonConversion<fir::cg::XEmboxOp> {
   using EmboxCommonConversion::EmboxCommonConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::cg::XEmboxOp xbox, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::ValueRange operands = adaptor.getOperands();
@@ -1711,7 +1711,7 @@ struct XEmboxOpConversion : public EmboxCommonConversion<fir::cg::XEmboxOp> {
 struct XReboxOpConversion : public EmboxCommonConversion<fir::cg::XReboxOp> {
   using EmboxCommonConversion::EmboxCommonConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::cg::XReboxOp rebox, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Location loc = rebox.getLoc();
@@ -1794,7 +1794,7 @@ struct XReboxOpConversion : public EmboxCommonConversion<fir::cg::XReboxOp> {
 private:
   /// Write resulting shape and base address in descriptor, and replace rebox
   /// op.
-  mlir::LogicalResult
+  llvm::LogicalResult
   finalizeRebox(fir::cg::XReboxOp rebox, mlir::Type destBoxTy, mlir::Value dest,
                 mlir::Value base, mlir::ValueRange lbounds,
                 mlir::ValueRange extents, mlir::ValueRange strides,
@@ -1825,7 +1825,7 @@ struct XReboxOpConversion : public EmboxCommonConversion<fir::cg::XReboxOp> {
   }
 
   // Apply slice given the base address, extents and strides of the input box.
-  mlir::LogicalResult
+  llvm::LogicalResult
   sliceBox(fir::cg::XReboxOp rebox, mlir::Type destBoxTy, mlir::Value dest,
            mlir::Value base, mlir::ValueRange inputExtents,
    ...
[truncated]

@llvmbot
Copy link
Member

llvmbot commented Jul 1, 2024

@llvm/pr-subscribers-mlir-amdgpu

Author: Ramkumar Ramachandra (artagnon)

Changes

This patch is part of a project to move the Presburger library into LLVM.


Patch is 352.44 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/97309.diff

314 Files Affected:

  • (modified) flang/include/flang/Optimizer/CodeGen/FIROpPatterns.h (+6-6)
  • (modified) flang/include/flang/Optimizer/CodeGen/TypeConverter.h (+1-1)
  • (modified) flang/include/flang/Optimizer/Dialect/FirAliasTagOpInterface.h (+2-2)
  • (modified) flang/include/flang/Optimizer/Dialect/FortranVariableInterface.td (+1-1)
  • (modified) flang/include/flang/Optimizer/Dialect/Support/KindMapping.h (+1-1)
  • (modified) flang/include/flang/Optimizer/HLFIR/HLFIROps.td (+4-4)
  • (modified) flang/lib/Optimizer/CodeGen/CodeGen.cpp (+69-69)
  • (modified) flang/lib/Optimizer/CodeGen/CodeGenOpenMP.cpp (+1-1)
  • (modified) flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp (+7-7)
  • (modified) flang/lib/Optimizer/CodeGen/TargetRewrite.cpp (+1-1)
  • (modified) flang/lib/Optimizer/CodeGen/TypeConverter.cpp (+1-1)
  • (modified) flang/lib/Optimizer/Dialect/CUF/CUFOps.cpp (+7-7)
  • (modified) flang/lib/Optimizer/Dialect/FIROps.cpp (+43-43)
  • (modified) flang/lib/Optimizer/Dialect/FIRType.cpp (+11-11)
  • (modified) flang/lib/Optimizer/Dialect/FirAliasTagOpInterface.cpp (+3-3)
  • (modified) flang/lib/Optimizer/Dialect/FortranVariableInterface.cpp (+1-1)
  • (modified) flang/lib/Optimizer/Dialect/Support/KindMapping.cpp (+2-2)
  • (modified) flang/lib/Optimizer/HLFIR/IR/HLFIROps.cpp (+42-42)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/BufferizeHLFIR.cpp (+13-14)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/ConvertToFIR.cpp (+9-9)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/InlineElementals.cpp (+1-1)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/LowerHLFIRIntrinsics.cpp (+6-7)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/LowerHLFIROrderedAssignments.cpp (+4-4)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/OptimizedBufferization.cpp (+8-8)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/SimplifyHLFIRIntrinsics.cpp (+1-1)
  • (modified) flang/lib/Optimizer/Transforms/AbstractResult.cpp (+5-5)
  • (modified) flang/lib/Optimizer/Transforms/AffineDemotion.cpp (+2-2)
  • (modified) flang/lib/Optimizer/Transforms/AffinePromotion.cpp (+2-2)
  • (modified) flang/lib/Optimizer/Transforms/ArrayValueCopy.cpp (+7-7)
  • (modified) flang/lib/Optimizer/Transforms/AssumedRankOpConversion.cpp (+2-2)
  • (modified) flang/lib/Optimizer/Transforms/CharacterConversion.cpp (+1-1)
  • (modified) flang/lib/Optimizer/Transforms/ConstantArgumentGlobalisation.cpp (+1-1)
  • (modified) flang/lib/Optimizer/Transforms/ControlFlowConverter.cpp (+3-3)
  • (modified) flang/lib/Optimizer/Transforms/MemoryAllocation.cpp (+1-1)
  • (modified) flang/lib/Optimizer/Transforms/PolymorphicOpConversion.cpp (+7-7)
  • (modified) flang/lib/Optimizer/Transforms/StackArrays.cpp (+4-5)
  • (modified) flang/tools/bbc/bbc.cpp (+2-2)
  • (modified) flang/tools/tco/tco.cpp (+1-1)
  • (renamed) llvm/include/llvm/Support/LogicalResult.h (+33-36)
  • (modified) mlir/docs/PDLL.md (+7-7)
  • (modified) mlir/docs/Tutorials/Toy/Ch-2.md (+3-3)
  • (modified) mlir/docs/Tutorials/Toy/Ch-3.md (+3-3)
  • (modified) mlir/docs/Tutorials/Toy/Ch-5.md (+1-1)
  • (modified) mlir/examples/standalone/lib/Standalone/StandalonePasses.cpp (-1)
  • (modified) mlir/examples/standalone/standalone-translate/standalone-translate.cpp (+1-2)
  • (modified) mlir/examples/toy/Ch2/mlir/Dialect.cpp (+3-4)
  • (modified) mlir/examples/toy/Ch2/mlir/MLIRGen.cpp (+4-5)
  • (modified) mlir/examples/toy/Ch3/mlir/Dialect.cpp (+3-4)
  • (modified) mlir/examples/toy/Ch3/mlir/MLIRGen.cpp (+4-5)
  • (modified) mlir/examples/toy/Ch3/mlir/ToyCombine.cpp (+1-2)
  • (modified) mlir/examples/toy/Ch3/toyc.cpp (-1)
  • (modified) mlir/examples/toy/Ch4/mlir/Dialect.cpp (+3-4)
  • (modified) mlir/examples/toy/Ch4/mlir/MLIRGen.cpp (+4-5)
  • (modified) mlir/examples/toy/Ch4/mlir/ToyCombine.cpp (+1-2)
  • (modified) mlir/examples/toy/Ch4/toyc.cpp (-1)
  • (modified) mlir/examples/toy/Ch5/mlir/Dialect.cpp (+3-4)
  • (modified) mlir/examples/toy/Ch5/mlir/LowerToAffineLoops.cpp (-1)
  • (modified) mlir/examples/toy/Ch5/mlir/MLIRGen.cpp (+4-5)
  • (modified) mlir/examples/toy/Ch5/mlir/ToyCombine.cpp (+1-2)
  • (modified) mlir/examples/toy/Ch5/toyc.cpp (-1)
  • (modified) mlir/examples/toy/Ch6/mlir/Dialect.cpp (+3-4)
  • (modified) mlir/examples/toy/Ch6/mlir/LowerToAffineLoops.cpp (-1)
  • (modified) mlir/examples/toy/Ch6/mlir/LowerToLLVM.cpp (-1)
  • (modified) mlir/examples/toy/Ch6/mlir/MLIRGen.cpp (+4-5)
  • (modified) mlir/examples/toy/Ch6/mlir/ToyCombine.cpp (+1-2)
  • (modified) mlir/examples/toy/Ch6/toyc.cpp (-1)
  • (modified) mlir/examples/toy/Ch7/mlir/Dialect.cpp (+6-7)
  • (modified) mlir/examples/toy/Ch7/mlir/LowerToAffineLoops.cpp (-1)
  • (modified) mlir/examples/toy/Ch7/mlir/LowerToLLVM.cpp (-1)
  • (modified) mlir/examples/toy/Ch7/mlir/MLIRGen.cpp (+5-6)
  • (modified) mlir/examples/toy/Ch7/mlir/ToyCombine.cpp (+1-2)
  • (modified) mlir/examples/toy/Ch7/toyc.cpp (-1)
  • (modified) mlir/examples/transform-opt/mlir-transform-opt.cpp (+5-5)
  • (modified) mlir/examples/transform/Ch4/lib/MyExtension.cpp (+1-1)
  • (modified) mlir/include/mlir/Analysis/FlatLinearValueConstraints.h (-1)
  • (modified) mlir/include/mlir/Bytecode/BytecodeImplementation.h (-1)
  • (modified) mlir/include/mlir/Bytecode/BytecodeOpInterface.h (-1)
  • (modified) mlir/include/mlir/Bytecode/BytecodeReader.h (-1)
  • (modified) mlir/include/mlir/Bytecode/BytecodeReaderConfig.h (-1)
  • (modified) mlir/include/mlir/CAPI/Support.h (+3-3)
  • (modified) mlir/include/mlir/Conversion/AffineToStandard/AffineToStandard.h (-1)
  • (modified) mlir/include/mlir/Conversion/ConvertToLLVM/ToLLVMInterface.h (-1)
  • (modified) mlir/include/mlir/Conversion/FuncToLLVM/ConvertFuncToLLVM.h (-1)
  • (modified) mlir/include/mlir/Conversion/GPUCommon/GPUCommonPass.h (-1)
  • (modified) mlir/include/mlir/Conversion/SCFToGPU/SCFToGPU.h (-1)
  • (modified) mlir/include/mlir/Conversion/VectorToGPU/VectorToGPU.h (-1)
  • (modified) mlir/include/mlir/Debug/CLOptionsSetup.h (-1)
  • (modified) mlir/include/mlir/Dialect/AMDGPU/Utils/Chipset.h (+1-1)
  • (modified) mlir/include/mlir/Dialect/Affine/Analysis/AffineStructures.h (-1)
  • (modified) mlir/include/mlir/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.h (+1-1)
  • (modified) mlir/include/mlir/Dialect/Affine/LoopUtils.h (-1)
  • (modified) mlir/include/mlir/Dialect/Affine/Transforms/Transforms.h (-1)
  • (modified) mlir/include/mlir/Dialect/Affine/Utils.h (-2)
  • (modified) mlir/include/mlir/Dialect/Arith/Transforms/Transforms.h (-1)
  • (modified) mlir/include/mlir/Dialect/Bufferization/IR/BufferizableOpInterface.td (+4-4)
  • (modified) mlir/include/mlir/Dialect/Bufferization/Transforms/OneShotModuleBufferize.h (+11-8)
  • (modified) mlir/include/mlir/Dialect/GPU/IR/CompilationAttrInterfaces.td (+2-2)
  • (modified) mlir/include/mlir/Dialect/GPU/Transforms/ParallelLoopMapper.h (-1)
  • (modified) mlir/include/mlir/Dialect/GPU/Transforms/Utils.h (-1)
  • (modified) mlir/include/mlir/Dialect/IRDL/IR/IRDLInterfaces.h (-1)
  • (modified) mlir/include/mlir/Dialect/IRDL/IR/IRDLTraits.h (-1)
  • (modified) mlir/include/mlir/Dialect/IRDL/IRDLLoading.h (+6-2)
  • (modified) mlir/include/mlir/Dialect/IRDL/IRDLVerifiers.h (-1)
  • (modified) mlir/include/mlir/Dialect/Linalg/TransformOps/GPUHeuristics.h (-1)
  • (modified) mlir/include/mlir/Dialect/Linalg/TransformOps/Syntax.h (-1)
  • (modified) mlir/include/mlir/Dialect/Linalg/Transforms/Transforms.h (-1)
  • (modified) mlir/include/mlir/Dialect/MemRef/Transforms/Transforms.h (+1-1)
  • (modified) mlir/include/mlir/Dialect/Mesh/Transforms/Spmdization.h (-1)
  • (modified) mlir/include/mlir/Dialect/NVGPU/Transforms/Transforms.h (+1-2)
  • (modified) mlir/include/mlir/Dialect/OpenACCMPCommon/Interfaces/AtomicInterfaces.td (+12-12)
  • (modified) mlir/include/mlir/Dialect/Polynomial/IR/Polynomial.h (-1)
  • (modified) mlir/include/mlir/Dialect/SCF/Transforms/Transforms.h (-2)
  • (modified) mlir/include/mlir/Dialect/SCF/Utils/AffineCanonicalizationUtils.h (-2)
  • (modified) mlir/include/mlir/Dialect/SCF/Utils/Utils.h (-1)
  • (modified) mlir/include/mlir/Dialect/SparseTensor/IR/SparseTensorInterfaces.td (+1-1)
  • (modified) mlir/include/mlir/Dialect/Transform/Interfaces/TransformInterfaces.h (+1-2)
  • (modified) mlir/include/mlir/Dialect/Transform/Interfaces/TransformInterfaces.td (+1-1)
  • (modified) mlir/include/mlir/Dialect/Transform/Transforms/TransformInterpreterUtils.h (-1)
  • (modified) mlir/include/mlir/Dialect/Vector/Transforms/VectorRewritePatterns.h (-1)
  • (modified) mlir/include/mlir/ExecutionEngine/JitRunner.h (+3-3)
  • (modified) mlir/include/mlir/IR/Action.h (-1)
  • (modified) mlir/include/mlir/IR/AffineExpr.h (-1)
  • (modified) mlir/include/mlir/IR/AffineExprVisitor.h (+1-1)
  • (modified) mlir/include/mlir/IR/AffineMap.h (-1)
  • (modified) mlir/include/mlir/IR/BuiltinAttributeInterfaces.h (-1)
  • (modified) mlir/include/mlir/IR/BuiltinAttributeInterfaces.td (+1-1)
  • (modified) mlir/include/mlir/IR/Diagnostics.h (-1)
  • (modified) mlir/include/mlir/IR/Dialect.h (-3)
  • (modified) mlir/include/mlir/IR/EnumAttr.td (+2-2)
  • (modified) mlir/include/mlir/IR/ExtensibleDialect.h (-1)
  • (modified) mlir/include/mlir/IR/OperationSupport.h (-1)
  • (modified) mlir/include/mlir/IR/StorageUniquerSupport.h (-1)
  • (modified) mlir/include/mlir/IR/SymbolInterfaces.td (+2-2)
  • (modified) mlir/include/mlir/IR/TensorEncoding.td (+1-1)
  • (modified) mlir/include/mlir/IR/Verifier.h (+2-1)
  • (modified) mlir/include/mlir/IR/Visitors.h (-1)
  • (modified) mlir/include/mlir/Interfaces/DataLayoutInterfaces.td (+5-5)
  • (modified) mlir/include/mlir/Interfaces/FoldInterfaces.h (-1)
  • (modified) mlir/include/mlir/Interfaces/FunctionInterfaces.td (+2-2)
  • (modified) mlir/include/mlir/Interfaces/InferTypeOpInterface.td (+10-10)
  • (modified) mlir/include/mlir/Interfaces/LoopLikeInterface.td (+1-1)
  • (modified) mlir/include/mlir/Interfaces/MemorySlotInterfaces.td (+3-3)
  • (modified) mlir/include/mlir/Interfaces/TilingInterface.td (+10-10)
  • (modified) mlir/include/mlir/Pass/Pass.h (-1)
  • (modified) mlir/include/mlir/Pass/PassManager.h (-1)
  • (modified) mlir/include/mlir/Pass/PassOptions.h (-1)
  • (modified) mlir/include/mlir/Query/Query.h (+6-7)
  • (modified) mlir/include/mlir/Reducer/ReductionNode.h (-1)
  • (modified) mlir/include/mlir/Support/LLVM.h (+13-1)
  • (modified) mlir/include/mlir/Support/StorageUniquer.h (-1)
  • (modified) mlir/include/mlir/Support/ToolUtilities.h (-2)
  • (modified) mlir/include/mlir/Target/Cpp/CppEmitter.h (-1)
  • (modified) mlir/include/mlir/Target/LLVM/ROCDL/Utils.h (+1)
  • (modified) mlir/include/mlir/Target/LLVMIR/LLVMImportInterface.h (-1)
  • (modified) mlir/include/mlir/Target/LLVMIR/LLVMTranslationInterface.h (-1)
  • (modified) mlir/include/mlir/Target/SPIRV/Serialization.h (-1)
  • (modified) mlir/include/mlir/Tools/PDLL/AST/Diagnostic.h (-1)
  • (modified) mlir/include/mlir/Tools/PDLL/CodeGen/MLIRGen.h (-2)
  • (modified) mlir/include/mlir/Tools/PDLL/Parser/Parser.h (+1-1)
  • (modified) mlir/include/mlir/Tools/lsp-server-support/CompilationDatabase.h (+1)
  • (modified) mlir/include/mlir/Tools/lsp-server-support/Protocol.h (-3)
  • (modified) mlir/include/mlir/Tools/lsp-server-support/Transport.h (-1)
  • (modified) mlir/include/mlir/Tools/mlir-lsp-server/MlirLspServerMain.h (+6-3)
  • (modified) mlir/include/mlir/Tools/mlir-opt/MlirOptMain.h (-1)
  • (modified) mlir/include/mlir/Tools/mlir-pdll-lsp-server/MlirPdllLspServerMain.h (+4-2)
  • (modified) mlir/include/mlir/Tools/mlir-query/MlirQueryMain.h (+1-1)
  • (modified) mlir/include/mlir/Tools/mlir-reduce/MlirReduceMain.h (+1-1)
  • (modified) mlir/include/mlir/Tools/mlir-translate/MlirTranslateMain.h (+1-1)
  • (modified) mlir/include/mlir/Tools/tblgen-lsp-server/TableGenLspServerMain.h (+4-3)
  • (modified) mlir/include/mlir/Transforms/HomomorphismSimplification.h (-1)
  • (modified) mlir/include/mlir/Transforms/Inliner.h (-1)
  • (modified) mlir/include/mlir/Transforms/LocationSnapshot.h (-1)
  • (modified) mlir/include/mlir/Transforms/SROA.h (+1-1)
  • (modified) mlir/lib/Analysis/AliasAnalysis/LocalAliasAnalysis.cpp (-1)
  • (modified) mlir/lib/Analysis/DataFlow/ConstantPropagationAnalysis.cpp (-1)
  • (modified) mlir/lib/Analysis/DataFlow/DeadCodeAnalysis.cpp (-1)
  • (modified) mlir/lib/Analysis/DataFlow/DenseAnalysis.cpp (-1)
  • (modified) mlir/lib/Analysis/DataFlow/SparseAnalysis.cpp (-1)
  • (modified) mlir/lib/Analysis/DataFlowFramework.cpp (-1)
  • (modified) mlir/lib/Analysis/FlatLinearValueConstraints.cpp (-1)
  • (modified) mlir/lib/AsmParser/AffineParser.cpp (-1)
  • (modified) mlir/lib/AsmParser/AsmParserState.cpp (-1)
  • (modified) mlir/lib/AsmParser/DialectSymbolParser.cpp (-1)
  • (modified) mlir/lib/AsmParser/LocationParser.cpp (-1)
  • (modified) mlir/lib/AsmParser/Parser.cpp (-1)
  • (modified) mlir/lib/AsmParser/TypeParser.cpp (-1)
  • (modified) mlir/lib/Bytecode/Reader/BytecodeReader.cpp (-1)
  • (modified) mlir/lib/Bytecode/Writer/BytecodeWriter.cpp (-1)
  • (modified) mlir/lib/CAPI/IR/BuiltinTypes.cpp (-1)
  • (modified) mlir/lib/Conversion/ArithToAMDGPU/ArithToAMDGPU.cpp (-1)
  • (modified) mlir/lib/Conversion/ArithToEmitC/ArithToEmitC.cpp (-1)
  • (modified) mlir/lib/Conversion/BufferizationToMemRef/BufferizationToMemRef.cpp (-1)
  • (modified) mlir/lib/Conversion/ControlFlowToSPIRV/ControlFlowToSPIRV.cpp (-1)
  • (modified) mlir/lib/Conversion/FuncToLLVM/FuncToLLVM.cpp (-1)
  • (modified) mlir/lib/Conversion/FuncToSPIRV/FuncToSPIRV.cpp (-1)
  • (modified) mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRV.cpp (-1)
  • (modified) mlir/lib/Conversion/MemRefToSPIRV/MemRefToSPIRV.cpp (-1)
  • (modified) mlir/lib/Conversion/NVVMToLLVM/NVVMToLLVM.cpp (-1)
  • (modified) mlir/lib/Conversion/SPIRVToLLVM/SPIRVToLLVM.cpp (-1)
  • (modified) mlir/lib/Conversion/TensorToLinalg/TensorToLinalg.cpp (-1)
  • (modified) mlir/lib/Conversion/TensorToSPIRV/TensorToSPIRV.cpp (-1)
  • (modified) mlir/lib/Conversion/VectorToGPU/VectorToGPU.cpp (-1)
  • (modified) mlir/lib/Conversion/VectorToSPIRV/VectorToSPIRV.cpp (-1)
  • (modified) mlir/lib/Dialect/Affine/Transforms/AffineScalarReplacement.cpp (-1)
  • (modified) mlir/lib/Dialect/Arith/IR/ArithOps.cpp (-1)
  • (modified) mlir/lib/Dialect/Arith/Transforms/EmulateNarrowType.cpp (-1)
  • (modified) mlir/lib/Dialect/Arith/Transforms/EmulateWideInt.cpp (-1)
  • (modified) mlir/lib/Dialect/Arith/Transforms/IntNarrowing.cpp (-1)
  • (modified) mlir/lib/Dialect/ArmNeon/Transforms/LowerContractionToSMMLAPattern.cpp (-1)
  • (modified) mlir/lib/Dialect/Bufferization/Transforms/LowerDeallocations.cpp (-1)
  • (modified) mlir/lib/Dialect/GPU/IR/GPUDialect.cpp (-1)
  • (modified) mlir/lib/Dialect/GPU/Transforms/SubgroupReduceLowering.cpp (-1)
  • (modified) mlir/lib/Dialect/IRDL/IR/IRDL.cpp (-1)
  • (modified) mlir/lib/Dialect/IRDL/IRDLLoading.cpp (-1)
  • (modified) mlir/lib/Dialect/IRDL/IRDLVerifiers.cpp (-1)
  • (modified) mlir/lib/Dialect/LLVMIR/IR/BasicPtxBuilderInterface.cpp (-1)
  • (modified) mlir/lib/Dialect/LLVMIR/IR/NVVMDialect.cpp (-1)
  • (modified) mlir/lib/Dialect/Linalg/Transforms/MeshShardingInterfaceImpl.cpp (-1)
  • (modified) mlir/lib/Dialect/Linalg/Transforms/TransposeConv2D.cpp (-1)
  • (modified) mlir/lib/Dialect/MemRef/IR/MemRefMemorySlot.cpp (-1)
  • (modified) mlir/lib/Dialect/MemRef/Transforms/EmulateNarrowType.cpp (-1)
  • (modified) mlir/lib/Dialect/Mesh/IR/MeshOps.cpp (-1)
  • (modified) mlir/lib/Dialect/Mesh/Interfaces/ShardingInterface.cpp (-1)
  • (modified) mlir/lib/Dialect/Mesh/Transforms/ShardingPropagation.cpp (-1)
  • (modified) mlir/lib/Dialect/Mesh/Transforms/Simplifications.cpp (-1)
  • (modified) mlir/lib/Dialect/Mesh/Transforms/Spmdization.cpp (-1)
  • (modified) mlir/lib/Dialect/NVGPU/Transforms/MmaSyncTF32Transform.cpp (-1)
  • (modified) mlir/lib/Dialect/NVGPU/Transforms/OptimizeSharedMemory.cpp (+1-2)
  • (modified) mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp (-1)
  • (modified) mlir/lib/Dialect/Polynomial/IR/Polynomial.cpp (-1)
  • (modified) mlir/lib/Dialect/Polynomial/IR/PolynomialAttributes.cpp (-1)
  • (modified) mlir/lib/Dialect/Polynomial/IR/PolynomialDialect.cpp (-1)
  • (modified) mlir/lib/Dialect/Polynomial/IR/PolynomialOps.cpp (-1)
  • (modified) mlir/lib/Dialect/Quant/IR/QuantDialectBytecode.cpp (-1)
  • (modified) mlir/lib/Dialect/SPIRV/IR/SPIRVOps.cpp (-1)
  • (modified) mlir/lib/Dialect/SPIRV/Transforms/SPIRVWebGPUTransforms.cpp (-1)
  • (modified) mlir/lib/Dialect/Tosa/IR/TosaOps.cpp (+1-1)
  • (modified) mlir/lib/Dialect/Tosa/Transforms/TosaFolders.cpp (-1)
  • (modified) mlir/lib/Dialect/Transform/Interfaces/TransformInterfaces.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorBitCast.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorBroadcast.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorContract.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorGather.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorInterleave.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorScan.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorShapeCast.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorTranspose.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/VectorLinearize.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp (-1)
  • (modified) mlir/lib/IR/AffineMap.cpp (-1)
  • (modified) mlir/lib/IR/ExtensibleDialect.cpp (-1)
  • (modified) mlir/lib/Query/Query.cpp (+5-11)
  • (modified) mlir/lib/Support/ToolUtilities.cpp (-1)
  • (modified) mlir/lib/TableGen/CodeGenHelpers.cpp (+6-6)
  • (modified) mlir/lib/Target/LLVMIR/Dialect/GPU/SelectObjectAttr.cpp (+2-2)
  • (modified) mlir/lib/Target/LLVMIR/Dialect/NVVM/NVVMToLLVMIRTranslation.cpp (-1)
  • (modified) mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp (-1)
  • (modified) mlir/lib/Target/LLVMIR/ModuleTranslation.cpp (-1)
  • (modified) mlir/lib/Target/SPIRV/Deserialization/Deserializer.cpp (-1)
  • (modified) mlir/lib/Target/SPIRV/Serialization/SerializeOps.cpp (-1)
  • (modified) mlir/lib/Target/SPIRV/Serialization/Serializer.cpp (-1)
  • (modified) mlir/lib/Tools/PDLL/CodeGen/CPPGen.cpp (+1-1)
  • (modified) mlir/lib/Tools/PDLL/Parser/Lexer.cpp (-1)
  • (modified) mlir/lib/Tools/PDLL/Parser/Lexer.h (-2)
  • (modified) mlir/lib/Tools/PDLL/Parser/Parser.cpp (-1)
  • (modified) mlir/lib/Tools/lsp-server-support/Protocol.cpp (-1)
  • (modified) mlir/lib/Tools/mlir-lsp-server/LSPServer.h (+5-2)
  • (modified) mlir/lib/Tools/mlir-opt/MlirOptMain.cpp (-1)
  • (modified) mlir/lib/Tools/mlir-pdll-lsp-server/LSPServer.h (+5-2)
  • (modified) mlir/lib/Tools/mlir-pdll-lsp-server/PDLLServer.h (+2-1)
  • (modified) mlir/lib/Tools/mlir-query/MlirQueryMain.cpp (+1-2)
  • (modified) mlir/lib/Tools/mlir-reduce/MlirReduceMain.cpp (-1)
  • (modified) mlir/lib/Tools/mlir-translate/MlirTranslateMain.cpp (-1)
  • (modified) mlir/lib/Tools/tblgen-lsp-server/LSPServer.h (+5-3)
  • (modified) mlir/lib/Tools/tblgen-lsp-server/TableGenServer.cpp (-4)
  • (modified) mlir/lib/Tools/tblgen-lsp-server/TableGenServer.h (+2-1)
  • (modified) mlir/test/lib/Analysis/DataFlow/TestLivenessAnalysis.cpp (-1)
  • (modified) mlir/test/lib/Dialect/ArmNeon/TestLowerToArmNeon.cpp (-1)
  • (modified) mlir/test/lib/Dialect/Mesh/TestOpLowering.cpp (-1)
  • (modified) mlir/test/lib/Dialect/Mesh/TestReshardingSpmdization.cpp (-1)
  • (modified) mlir/test/lib/Dialect/Test/TestAttributes.cpp (-1)
  • (modified) mlir/test/lib/Dialect/Test/TestDialect.cpp (-1)
  • (modified) mlir/test/lib/Dialect/Test/TestOpDefs.cpp (+1-1)
  • (modified) mlir/test/lib/Dialect/Test/TestOps.h (+5-5)
  • (modified) mlir/test/lib/Dialect/Test/TestOps.td (+6-6)
  • (modified) mlir/test/lib/Dialect/Test/TestOpsSyntax.cpp (+1-1)
  • (modified) mlir/test/lib/Dialect/Test/TestOpsSyntax.td (+4-4)
  • (modified) mlir/test/lib/Dialect/Test/TestTypeDefs.td (+1-1)
  • (modified) mlir/test/lib/Dialect/Test/TestTypes.h (+2-2)
  • (modified) mlir/test/mlir-pdll/CodeGen/CPP/general.pdll (+1-1)
  • (modified) mlir/test/mlir-tblgen/attrdefs.td (+1-1)
  • (modified) mlir/test/mlir-tblgen/constraint-unique.td (+9-9)
  • (modified) mlir/test/mlir-tblgen/interfaces-as-constraints.td (+4-4)
  • (modified) mlir/test/mlir-tblgen/op-attribute.td (+2-2)
  • (modified) mlir/test/mlir-tblgen/op-decl-and-defs.td (+5-5)
  • (modified) mlir/test/mlir-tblgen/predicate.td (+3-3)
  • (modified) mlir/test/mlir-tblgen/rewriter-static-matcher.td (+3-3)
  • (modified) mlir/test/mlir-tblgen/typedefs.td (+1-1)
  • (modified) mlir/test/python/python_test_ops.td (+3-3)
  • (modified) mlir/tools/mlir-pdll-lsp-server/mlir-pdll-lsp-server.cpp (+1-1)
diff --git a/flang/include/flang/Optimizer/CodeGen/FIROpPatterns.h b/flang/include/flang/Optimizer/CodeGen/FIROpPatterns.h
index ac095664f6188..91b2025176770 100644
--- a/flang/include/flang/Optimizer/CodeGen/FIROpPatterns.h
+++ b/flang/include/flang/Optimizer/CodeGen/FIROpPatterns.h
@@ -205,10 +205,10 @@ class FIROpConversion : public ConvertFIRToLLVMPattern {
     rewrite(mlir::cast<SourceOp>(op),
             OpAdaptor(operands, mlir::cast<SourceOp>(op)), rewriter);
   }
-  mlir::LogicalResult match(mlir::Operation *op) const final {
+  llvm::LogicalResult match(mlir::Operation *op) const final {
     return match(mlir::cast<SourceOp>(op));
   }
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(mlir::Operation *op, mlir::ArrayRef<mlir::Value> operands,
                   mlir::ConversionPatternRewriter &rewriter) const final {
     return matchAndRewrite(mlir::cast<SourceOp>(op),
@@ -218,14 +218,14 @@ class FIROpConversion : public ConvertFIRToLLVMPattern {
 
   /// Rewrite and Match methods that operate on the SourceOp type. These must be
   /// overridden by the derived pattern class.
-  virtual mlir::LogicalResult match(SourceOp op) const {
+  virtual llvm::LogicalResult match(SourceOp op) const {
     llvm_unreachable("must override match or matchAndRewrite");
   }
   virtual void rewrite(SourceOp op, OpAdaptor adaptor,
                        mlir::ConversionPatternRewriter &rewriter) const {
     llvm_unreachable("must override rewrite or matchAndRewrite");
   }
-  virtual mlir::LogicalResult
+  virtual llvm::LogicalResult
   matchAndRewrite(SourceOp op, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const {
     if (mlir::failed(match(op)))
@@ -246,14 +246,14 @@ class FIROpAndTypeConversion : public FIROpConversion<FromOp> {
   using FIROpConversion<FromOp>::FIROpConversion;
   using OpAdaptor = typename FromOp::Adaptor;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(FromOp op, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const final {
     mlir::Type ty = this->convertType(op.getType());
     return doRewrite(op, ty, adaptor, rewriter);
   }
 
-  virtual mlir::LogicalResult
+  virtual llvm::LogicalResult
   doRewrite(FromOp addr, mlir::Type ty, OpAdaptor adaptor,
             mlir::ConversionPatternRewriter &rewriter) const = 0;
 };
diff --git a/flang/include/flang/Optimizer/CodeGen/TypeConverter.h b/flang/include/flang/Optimizer/CodeGen/TypeConverter.h
index 58803a5cc4044..ece3e4e073f68 100644
--- a/flang/include/flang/Optimizer/CodeGen/TypeConverter.h
+++ b/flang/include/flang/Optimizer/CodeGen/TypeConverter.h
@@ -60,7 +60,7 @@ class LLVMTypeConverter : public mlir::LLVMTypeConverter {
   mlir::Type indexType() const;
 
   // fir.type<name(p : TY'...){f : TY...}>  -->  llvm<"%name = { ty... }">
-  std::optional<mlir::LogicalResult>
+  std::optional<llvm::LogicalResult>
   convertRecordType(fir::RecordType derived,
                     llvm::SmallVectorImpl<mlir::Type> &results);
 
diff --git a/flang/include/flang/Optimizer/Dialect/FirAliasTagOpInterface.h b/flang/include/flang/Optimizer/Dialect/FirAliasTagOpInterface.h
index f2d5b39acf3a7..1e3728e735145 100644
--- a/flang/include/flang/Optimizer/Dialect/FirAliasTagOpInterface.h
+++ b/flang/include/flang/Optimizer/Dialect/FirAliasTagOpInterface.h
@@ -16,10 +16,10 @@
 
 #include "mlir/IR/OpDefinition.h"
 #include "mlir/IR/Operation.h"
-#include "mlir/Support/LogicalResult.h"
+#include "llvm/Support/LogicalResult.h"
 
 namespace fir::detail {
-mlir::LogicalResult verifyFirAliasTagOpInterface(mlir::Operation *op);
+llvm::LogicalResult verifyFirAliasTagOpInterface(mlir::Operation *op);
 } // namespace fir::detail
 
 #include "flang/Optimizer/Dialect/FirAliasTagOpInterface.h.inc"
diff --git a/flang/include/flang/Optimizer/Dialect/FortranVariableInterface.td b/flang/include/flang/Optimizer/Dialect/FortranVariableInterface.td
index 3f78a93a2515e..926e00ca04340 100644
--- a/flang/include/flang/Optimizer/Dialect/FortranVariableInterface.td
+++ b/flang/include/flang/Optimizer/Dialect/FortranVariableInterface.td
@@ -192,7 +192,7 @@ def fir_FortranVariableOpInterface : OpInterface<"FortranVariableOpInterface"> {
     }
 
     /// Interface verifier imlementation for declare operations.
-    mlir::LogicalResult verifyDeclareLikeOpImpl(mlir::Value memRef);
+    llvm::LogicalResult verifyDeclareLikeOpImpl(mlir::Value memRef);
 
   }];
 
diff --git a/flang/include/flang/Optimizer/Dialect/Support/KindMapping.h b/flang/include/flang/Optimizer/Dialect/Support/KindMapping.h
index 138123b7b48ba..083526fcbac94 100644
--- a/flang/include/flang/Optimizer/Dialect/Support/KindMapping.h
+++ b/flang/include/flang/Optimizer/Dialect/Support/KindMapping.h
@@ -124,7 +124,7 @@ class KindMapping {
 private:
   MatchResult badMapString(const llvm::Twine &ptr);
   MatchResult parse(llvm::StringRef kindMap);
-  mlir::LogicalResult setDefaultKinds(llvm::ArrayRef<KindTy> defs);
+  llvm::LogicalResult setDefaultKinds(llvm::ArrayRef<KindTy> defs);
 
   mlir::MLIRContext *context;
   llvm::DenseMap<std::pair<char, KindTy>, Bitsize> intMap;
diff --git a/flang/include/flang/Optimizer/HLFIR/HLFIROps.td b/flang/include/flang/Optimizer/HLFIR/HLFIROps.td
index e9915e899c2c9..fdf0db9d3c75d 100644
--- a/flang/include/flang/Optimizer/HLFIR/HLFIROps.td
+++ b/flang/include/flang/Optimizer/HLFIR/HLFIROps.td
@@ -733,7 +733,7 @@ def hlfir_AssociateOp : hlfir_Op<"associate", [AttrSizedOperandSegments,
       CArg<"mlir::Value", "{}">:$shape, CArg<"mlir::ValueRange", "{}">:$typeparams,
       CArg<"fir::FortranVariableFlagsAttr", "{}">:$fortran_attrs)>,
     OpBuilder<(ins "mlir::Value":$memref, CArg<"mlir::Value", "{}">:$shape,
-      CArg<"mlir::ValueRange", "{}">:$typeparams, 
+      CArg<"mlir::ValueRange", "{}">:$typeparams,
       CArg<"fir::FortranVariableFlagsAttr", "{}">:$fortran_attrs,
       CArg<"llvm::ArrayRef<mlir::NamedAttribute>", "{}">:$attributes)>];
 
@@ -1258,7 +1258,7 @@ def hlfir_OrderedAssignmentTreeOpInterface : OpInterface<"OrderedAssignmentTreeO
 
   let extraClassDeclaration = [{
     /// Interface verifier imlementation.
-    mlir::LogicalResult verifyImpl();
+    llvm::LogicalResult verifyImpl();
 
     mlir::Block* getSubTreeBlock() {
       mlir::Region* region = getSubTreeRegion();
@@ -1733,8 +1733,8 @@ def hlfir_CharExtremumOp : hlfir_Op<"char_extremum",
     [DeclareOpInterfaceMethods<MemoryEffectsOpInterface>]> {
   let summary = "Find max/min from given character strings";
   let description = [{
-    Find the lexicographical minimum or maximum of two or more character 
-    strings of the same character kind and return the string with the lexicographical 
+    Find the lexicographical minimum or maximum of two or more character
+    strings of the same character kind and return the string with the lexicographical
     minimum or maximum number of characters. Example:
 
     %0 = hlfir.char_extremum min, %arg0, %arg1 : (!fir.ref<!fir.char<1,10>>, !fir.ref<!fir.char<1,20>>) -> !hlfir.expr<!fir.char<1,10>>
diff --git a/flang/lib/Optimizer/CodeGen/CodeGen.cpp b/flang/lib/Optimizer/CodeGen/CodeGen.cpp
index 5f35825783c51..7483acfcd1ca7 100644
--- a/flang/lib/Optimizer/CodeGen/CodeGen.cpp
+++ b/flang/lib/Optimizer/CodeGen/CodeGen.cpp
@@ -113,7 +113,7 @@ namespace {
 struct AddrOfOpConversion : public fir::FIROpConversion<fir::AddrOfOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::AddrOfOp addr, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     auto ty = convertType(addr.getType());
@@ -174,7 +174,7 @@ namespace {
 struct DeclareOpConversion : public fir::FIROpConversion<fir::cg::XDeclareOp> {
 public:
   using FIROpConversion::FIROpConversion;
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::cg::XDeclareOp declareOp, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     auto memRef = adaptor.getOperands()[0];
@@ -197,7 +197,7 @@ namespace {
 struct AllocaOpConversion : public fir::FIROpConversion<fir::AllocaOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::AllocaOp alloc, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::ValueRange operands = adaptor.getOperands();
@@ -294,7 +294,7 @@ namespace {
 struct BoxAddrOpConversion : public fir::FIROpConversion<fir::BoxAddrOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxAddrOp boxaddr, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value a = adaptor.getOperands()[0];
@@ -316,7 +316,7 @@ struct BoxAddrOpConversion : public fir::FIROpConversion<fir::BoxAddrOp> {
 struct BoxCharLenOpConversion : public fir::FIROpConversion<fir::BoxCharLenOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxCharLenOp boxCharLen, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value boxChar = adaptor.getOperands()[0];
@@ -339,7 +339,7 @@ struct BoxCharLenOpConversion : public fir::FIROpConversion<fir::BoxCharLenOp> {
 struct BoxDimsOpConversion : public fir::FIROpConversion<fir::BoxDimsOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxDimsOp boxdims, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     llvm::SmallVector<mlir::Type, 3> resultTypes = {
@@ -361,7 +361,7 @@ struct BoxDimsOpConversion : public fir::FIROpConversion<fir::BoxDimsOp> {
 struct BoxEleSizeOpConversion : public fir::FIROpConversion<fir::BoxEleSizeOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxEleSizeOp boxelesz, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value box = adaptor.getOperands()[0];
@@ -379,7 +379,7 @@ struct BoxEleSizeOpConversion : public fir::FIROpConversion<fir::BoxEleSizeOp> {
 struct BoxIsAllocOpConversion : public fir::FIROpConversion<fir::BoxIsAllocOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxIsAllocOp boxisalloc, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value box = adaptor.getOperands()[0];
@@ -397,7 +397,7 @@ struct BoxIsAllocOpConversion : public fir::FIROpConversion<fir::BoxIsAllocOp> {
 struct BoxIsArrayOpConversion : public fir::FIROpConversion<fir::BoxIsArrayOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxIsArrayOp boxisarray, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value a = adaptor.getOperands()[0];
@@ -416,7 +416,7 @@ struct BoxIsArrayOpConversion : public fir::FIROpConversion<fir::BoxIsArrayOp> {
 struct BoxIsPtrOpConversion : public fir::FIROpConversion<fir::BoxIsPtrOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxIsPtrOp boxisptr, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value box = adaptor.getOperands()[0];
@@ -434,7 +434,7 @@ struct BoxIsPtrOpConversion : public fir::FIROpConversion<fir::BoxIsPtrOp> {
 struct BoxRankOpConversion : public fir::FIROpConversion<fir::BoxRankOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxRankOp boxrank, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value a = adaptor.getOperands()[0];
@@ -456,7 +456,7 @@ struct BoxProcHostOpConversion
     : public fir::FIROpConversion<fir::BoxProcHostOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxProcHostOp boxprochost, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     TODO(boxprochost.getLoc(), "fir.boxproc_host codegen");
@@ -470,7 +470,7 @@ struct BoxTypeDescOpConversion
     : public fir::FIROpConversion<fir::BoxTypeDescOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxTypeDescOp boxtypedesc, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value box = adaptor.getOperands()[0];
@@ -488,7 +488,7 @@ struct BoxTypeCodeOpConversion
     : public fir::FIROpConversion<fir::BoxTypeCodeOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxTypeCodeOp op, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value box = adaptor.getOperands()[0];
@@ -506,7 +506,7 @@ struct BoxTypeCodeOpConversion
 struct StringLitOpConversion : public fir::FIROpConversion<fir::StringLitOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::StringLitOp constop, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     auto ty = convertType(constop.getType());
@@ -547,7 +547,7 @@ struct StringLitOpConversion : public fir::FIROpConversion<fir::StringLitOp> {
 struct CallOpConversion : public fir::FIROpConversion<fir::CallOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::CallOp call, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     llvm::SmallVector<mlir::Type> resultTys;
@@ -578,7 +578,7 @@ namespace {
 struct CmpcOpConversion : public fir::FIROpConversion<fir::CmpcOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::CmpcOp cmp, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::ValueRange operands = adaptor.getOperands();
@@ -616,7 +616,7 @@ struct CmpcOpConversion : public fir::FIROpConversion<fir::CmpcOp> {
 struct ConstcOpConversion : public fir::FIROpConversion<fir::ConstcOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::ConstcOp conc, OpAdaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Location loc = conc.getLoc();
@@ -647,7 +647,7 @@ struct ConvertOpConversion : public fir::FIROpConversion<fir::ConvertOp> {
     return mlir::isa<mlir::FloatType>(ty);
   }
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::ConvertOp convert, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     auto fromFirTy = convert.getValue().getType();
@@ -814,7 +814,7 @@ struct ConvertOpConversion : public fir::FIROpConversion<fir::ConvertOp> {
 struct TypeInfoOpConversion : public fir::FIROpConversion<fir::TypeInfoOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::TypeInfoOp op, OpAdaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     rewriter.eraseOp(op);
@@ -827,7 +827,7 @@ struct TypeInfoOpConversion : public fir::FIROpConversion<fir::TypeInfoOp> {
 struct DTEntryOpConversion : public fir::FIROpConversion<fir::DTEntryOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::DTEntryOp op, OpAdaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     rewriter.eraseOp(op);
@@ -839,7 +839,7 @@ struct DTEntryOpConversion : public fir::FIROpConversion<fir::DTEntryOp> {
 struct GlobalLenOpConversion : public fir::FIROpConversion<fir::GlobalLenOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::GlobalLenOp globalLen, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     TODO(globalLen.getLoc(), "fir.global_len codegen");
@@ -853,7 +853,7 @@ struct LenParamIndexOpConversion
   using FIROpConversion::FIROpConversion;
 
   // FIXME: this should be specialized by the runtime target
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::LenParamIndexOp lenp, OpAdaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     TODO(lenp.getLoc(), "fir.len_param_index codegen");
@@ -867,7 +867,7 @@ struct LenParamIndexOpConversion
 struct EmboxCharOpConversion : public fir::FIROpConversion<fir::EmboxCharOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::EmboxCharOp emboxChar, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::ValueRange operands = adaptor.getOperands();
@@ -960,7 +960,7 @@ namespace {
 struct AllocMemOpConversion : public fir::FIROpConversion<fir::AllocMemOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::AllocMemOp heap, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Type heapTy = heap.getType();
@@ -1030,7 +1030,7 @@ namespace {
 struct FreeMemOpConversion : public fir::FIROpConversion<fir::FreeMemOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::FreeMemOp freemem, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Location loc = freemem.getLoc();
@@ -1481,7 +1481,7 @@ computeTripletExtent(mlir::ConversionPatternRewriter &rewriter,
 struct EmboxOpConversion : public EmboxCommonConversion<fir::EmboxOp> {
   using EmboxCommonConversion::EmboxCommonConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::EmboxOp embox, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::ValueRange operands = adaptor.getOperands();
@@ -1513,7 +1513,7 @@ struct EmboxOpConversion : public EmboxCommonConversion<fir::EmboxOp> {
 struct XEmboxOpConversion : public EmboxCommonConversion<fir::cg::XEmboxOp> {
   using EmboxCommonConversion::EmboxCommonConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::cg::XEmboxOp xbox, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::ValueRange operands = adaptor.getOperands();
@@ -1711,7 +1711,7 @@ struct XEmboxOpConversion : public EmboxCommonConversion<fir::cg::XEmboxOp> {
 struct XReboxOpConversion : public EmboxCommonConversion<fir::cg::XReboxOp> {
   using EmboxCommonConversion::EmboxCommonConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::cg::XReboxOp rebox, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Location loc = rebox.getLoc();
@@ -1794,7 +1794,7 @@ struct XReboxOpConversion : public EmboxCommonConversion<fir::cg::XReboxOp> {
 private:
   /// Write resulting shape and base address in descriptor, and replace rebox
   /// op.
-  mlir::LogicalResult
+  llvm::LogicalResult
   finalizeRebox(fir::cg::XReboxOp rebox, mlir::Type destBoxTy, mlir::Value dest,
                 mlir::Value base, mlir::ValueRange lbounds,
                 mlir::ValueRange extents, mlir::ValueRange strides,
@@ -1825,7 +1825,7 @@ struct XReboxOpConversion : public EmboxCommonConversion<fir::cg::XReboxOp> {
   }
 
   // Apply slice given the base address, extents and strides of the input box.
-  mlir::LogicalResult
+  llvm::LogicalResult
   sliceBox(fir::cg::XReboxOp rebox, mlir::Type destBoxTy, mlir::Value dest,
            mlir::Value base, mlir::ValueRange inputExtents,
    ...
[truncated]

@llvmbot
Copy link
Member

llvmbot commented Jul 1, 2024

@llvm/pr-subscribers-mlir-ods

Author: Ramkumar Ramachandra (artagnon)

Changes

This patch is part of a project to move the Presburger library into LLVM.


Patch is 352.44 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/97309.diff

314 Files Affected:

  • (modified) flang/include/flang/Optimizer/CodeGen/FIROpPatterns.h (+6-6)
  • (modified) flang/include/flang/Optimizer/CodeGen/TypeConverter.h (+1-1)
  • (modified) flang/include/flang/Optimizer/Dialect/FirAliasTagOpInterface.h (+2-2)
  • (modified) flang/include/flang/Optimizer/Dialect/FortranVariableInterface.td (+1-1)
  • (modified) flang/include/flang/Optimizer/Dialect/Support/KindMapping.h (+1-1)
  • (modified) flang/include/flang/Optimizer/HLFIR/HLFIROps.td (+4-4)
  • (modified) flang/lib/Optimizer/CodeGen/CodeGen.cpp (+69-69)
  • (modified) flang/lib/Optimizer/CodeGen/CodeGenOpenMP.cpp (+1-1)
  • (modified) flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp (+7-7)
  • (modified) flang/lib/Optimizer/CodeGen/TargetRewrite.cpp (+1-1)
  • (modified) flang/lib/Optimizer/CodeGen/TypeConverter.cpp (+1-1)
  • (modified) flang/lib/Optimizer/Dialect/CUF/CUFOps.cpp (+7-7)
  • (modified) flang/lib/Optimizer/Dialect/FIROps.cpp (+43-43)
  • (modified) flang/lib/Optimizer/Dialect/FIRType.cpp (+11-11)
  • (modified) flang/lib/Optimizer/Dialect/FirAliasTagOpInterface.cpp (+3-3)
  • (modified) flang/lib/Optimizer/Dialect/FortranVariableInterface.cpp (+1-1)
  • (modified) flang/lib/Optimizer/Dialect/Support/KindMapping.cpp (+2-2)
  • (modified) flang/lib/Optimizer/HLFIR/IR/HLFIROps.cpp (+42-42)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/BufferizeHLFIR.cpp (+13-14)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/ConvertToFIR.cpp (+9-9)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/InlineElementals.cpp (+1-1)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/LowerHLFIRIntrinsics.cpp (+6-7)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/LowerHLFIROrderedAssignments.cpp (+4-4)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/OptimizedBufferization.cpp (+8-8)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/SimplifyHLFIRIntrinsics.cpp (+1-1)
  • (modified) flang/lib/Optimizer/Transforms/AbstractResult.cpp (+5-5)
  • (modified) flang/lib/Optimizer/Transforms/AffineDemotion.cpp (+2-2)
  • (modified) flang/lib/Optimizer/Transforms/AffinePromotion.cpp (+2-2)
  • (modified) flang/lib/Optimizer/Transforms/ArrayValueCopy.cpp (+7-7)
  • (modified) flang/lib/Optimizer/Transforms/AssumedRankOpConversion.cpp (+2-2)
  • (modified) flang/lib/Optimizer/Transforms/CharacterConversion.cpp (+1-1)
  • (modified) flang/lib/Optimizer/Transforms/ConstantArgumentGlobalisation.cpp (+1-1)
  • (modified) flang/lib/Optimizer/Transforms/ControlFlowConverter.cpp (+3-3)
  • (modified) flang/lib/Optimizer/Transforms/MemoryAllocation.cpp (+1-1)
  • (modified) flang/lib/Optimizer/Transforms/PolymorphicOpConversion.cpp (+7-7)
  • (modified) flang/lib/Optimizer/Transforms/StackArrays.cpp (+4-5)
  • (modified) flang/tools/bbc/bbc.cpp (+2-2)
  • (modified) flang/tools/tco/tco.cpp (+1-1)
  • (renamed) llvm/include/llvm/Support/LogicalResult.h (+33-36)
  • (modified) mlir/docs/PDLL.md (+7-7)
  • (modified) mlir/docs/Tutorials/Toy/Ch-2.md (+3-3)
  • (modified) mlir/docs/Tutorials/Toy/Ch-3.md (+3-3)
  • (modified) mlir/docs/Tutorials/Toy/Ch-5.md (+1-1)
  • (modified) mlir/examples/standalone/lib/Standalone/StandalonePasses.cpp (-1)
  • (modified) mlir/examples/standalone/standalone-translate/standalone-translate.cpp (+1-2)
  • (modified) mlir/examples/toy/Ch2/mlir/Dialect.cpp (+3-4)
  • (modified) mlir/examples/toy/Ch2/mlir/MLIRGen.cpp (+4-5)
  • (modified) mlir/examples/toy/Ch3/mlir/Dialect.cpp (+3-4)
  • (modified) mlir/examples/toy/Ch3/mlir/MLIRGen.cpp (+4-5)
  • (modified) mlir/examples/toy/Ch3/mlir/ToyCombine.cpp (+1-2)
  • (modified) mlir/examples/toy/Ch3/toyc.cpp (-1)
  • (modified) mlir/examples/toy/Ch4/mlir/Dialect.cpp (+3-4)
  • (modified) mlir/examples/toy/Ch4/mlir/MLIRGen.cpp (+4-5)
  • (modified) mlir/examples/toy/Ch4/mlir/ToyCombine.cpp (+1-2)
  • (modified) mlir/examples/toy/Ch4/toyc.cpp (-1)
  • (modified) mlir/examples/toy/Ch5/mlir/Dialect.cpp (+3-4)
  • (modified) mlir/examples/toy/Ch5/mlir/LowerToAffineLoops.cpp (-1)
  • (modified) mlir/examples/toy/Ch5/mlir/MLIRGen.cpp (+4-5)
  • (modified) mlir/examples/toy/Ch5/mlir/ToyCombine.cpp (+1-2)
  • (modified) mlir/examples/toy/Ch5/toyc.cpp (-1)
  • (modified) mlir/examples/toy/Ch6/mlir/Dialect.cpp (+3-4)
  • (modified) mlir/examples/toy/Ch6/mlir/LowerToAffineLoops.cpp (-1)
  • (modified) mlir/examples/toy/Ch6/mlir/LowerToLLVM.cpp (-1)
  • (modified) mlir/examples/toy/Ch6/mlir/MLIRGen.cpp (+4-5)
  • (modified) mlir/examples/toy/Ch6/mlir/ToyCombine.cpp (+1-2)
  • (modified) mlir/examples/toy/Ch6/toyc.cpp (-1)
  • (modified) mlir/examples/toy/Ch7/mlir/Dialect.cpp (+6-7)
  • (modified) mlir/examples/toy/Ch7/mlir/LowerToAffineLoops.cpp (-1)
  • (modified) mlir/examples/toy/Ch7/mlir/LowerToLLVM.cpp (-1)
  • (modified) mlir/examples/toy/Ch7/mlir/MLIRGen.cpp (+5-6)
  • (modified) mlir/examples/toy/Ch7/mlir/ToyCombine.cpp (+1-2)
  • (modified) mlir/examples/toy/Ch7/toyc.cpp (-1)
  • (modified) mlir/examples/transform-opt/mlir-transform-opt.cpp (+5-5)
  • (modified) mlir/examples/transform/Ch4/lib/MyExtension.cpp (+1-1)
  • (modified) mlir/include/mlir/Analysis/FlatLinearValueConstraints.h (-1)
  • (modified) mlir/include/mlir/Bytecode/BytecodeImplementation.h (-1)
  • (modified) mlir/include/mlir/Bytecode/BytecodeOpInterface.h (-1)
  • (modified) mlir/include/mlir/Bytecode/BytecodeReader.h (-1)
  • (modified) mlir/include/mlir/Bytecode/BytecodeReaderConfig.h (-1)
  • (modified) mlir/include/mlir/CAPI/Support.h (+3-3)
  • (modified) mlir/include/mlir/Conversion/AffineToStandard/AffineToStandard.h (-1)
  • (modified) mlir/include/mlir/Conversion/ConvertToLLVM/ToLLVMInterface.h (-1)
  • (modified) mlir/include/mlir/Conversion/FuncToLLVM/ConvertFuncToLLVM.h (-1)
  • (modified) mlir/include/mlir/Conversion/GPUCommon/GPUCommonPass.h (-1)
  • (modified) mlir/include/mlir/Conversion/SCFToGPU/SCFToGPU.h (-1)
  • (modified) mlir/include/mlir/Conversion/VectorToGPU/VectorToGPU.h (-1)
  • (modified) mlir/include/mlir/Debug/CLOptionsSetup.h (-1)
  • (modified) mlir/include/mlir/Dialect/AMDGPU/Utils/Chipset.h (+1-1)
  • (modified) mlir/include/mlir/Dialect/Affine/Analysis/AffineStructures.h (-1)
  • (modified) mlir/include/mlir/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.h (+1-1)
  • (modified) mlir/include/mlir/Dialect/Affine/LoopUtils.h (-1)
  • (modified) mlir/include/mlir/Dialect/Affine/Transforms/Transforms.h (-1)
  • (modified) mlir/include/mlir/Dialect/Affine/Utils.h (-2)
  • (modified) mlir/include/mlir/Dialect/Arith/Transforms/Transforms.h (-1)
  • (modified) mlir/include/mlir/Dialect/Bufferization/IR/BufferizableOpInterface.td (+4-4)
  • (modified) mlir/include/mlir/Dialect/Bufferization/Transforms/OneShotModuleBufferize.h (+11-8)
  • (modified) mlir/include/mlir/Dialect/GPU/IR/CompilationAttrInterfaces.td (+2-2)
  • (modified) mlir/include/mlir/Dialect/GPU/Transforms/ParallelLoopMapper.h (-1)
  • (modified) mlir/include/mlir/Dialect/GPU/Transforms/Utils.h (-1)
  • (modified) mlir/include/mlir/Dialect/IRDL/IR/IRDLInterfaces.h (-1)
  • (modified) mlir/include/mlir/Dialect/IRDL/IR/IRDLTraits.h (-1)
  • (modified) mlir/include/mlir/Dialect/IRDL/IRDLLoading.h (+6-2)
  • (modified) mlir/include/mlir/Dialect/IRDL/IRDLVerifiers.h (-1)
  • (modified) mlir/include/mlir/Dialect/Linalg/TransformOps/GPUHeuristics.h (-1)
  • (modified) mlir/include/mlir/Dialect/Linalg/TransformOps/Syntax.h (-1)
  • (modified) mlir/include/mlir/Dialect/Linalg/Transforms/Transforms.h (-1)
  • (modified) mlir/include/mlir/Dialect/MemRef/Transforms/Transforms.h (+1-1)
  • (modified) mlir/include/mlir/Dialect/Mesh/Transforms/Spmdization.h (-1)
  • (modified) mlir/include/mlir/Dialect/NVGPU/Transforms/Transforms.h (+1-2)
  • (modified) mlir/include/mlir/Dialect/OpenACCMPCommon/Interfaces/AtomicInterfaces.td (+12-12)
  • (modified) mlir/include/mlir/Dialect/Polynomial/IR/Polynomial.h (-1)
  • (modified) mlir/include/mlir/Dialect/SCF/Transforms/Transforms.h (-2)
  • (modified) mlir/include/mlir/Dialect/SCF/Utils/AffineCanonicalizationUtils.h (-2)
  • (modified) mlir/include/mlir/Dialect/SCF/Utils/Utils.h (-1)
  • (modified) mlir/include/mlir/Dialect/SparseTensor/IR/SparseTensorInterfaces.td (+1-1)
  • (modified) mlir/include/mlir/Dialect/Transform/Interfaces/TransformInterfaces.h (+1-2)
  • (modified) mlir/include/mlir/Dialect/Transform/Interfaces/TransformInterfaces.td (+1-1)
  • (modified) mlir/include/mlir/Dialect/Transform/Transforms/TransformInterpreterUtils.h (-1)
  • (modified) mlir/include/mlir/Dialect/Vector/Transforms/VectorRewritePatterns.h (-1)
  • (modified) mlir/include/mlir/ExecutionEngine/JitRunner.h (+3-3)
  • (modified) mlir/include/mlir/IR/Action.h (-1)
  • (modified) mlir/include/mlir/IR/AffineExpr.h (-1)
  • (modified) mlir/include/mlir/IR/AffineExprVisitor.h (+1-1)
  • (modified) mlir/include/mlir/IR/AffineMap.h (-1)
  • (modified) mlir/include/mlir/IR/BuiltinAttributeInterfaces.h (-1)
  • (modified) mlir/include/mlir/IR/BuiltinAttributeInterfaces.td (+1-1)
  • (modified) mlir/include/mlir/IR/Diagnostics.h (-1)
  • (modified) mlir/include/mlir/IR/Dialect.h (-3)
  • (modified) mlir/include/mlir/IR/EnumAttr.td (+2-2)
  • (modified) mlir/include/mlir/IR/ExtensibleDialect.h (-1)
  • (modified) mlir/include/mlir/IR/OperationSupport.h (-1)
  • (modified) mlir/include/mlir/IR/StorageUniquerSupport.h (-1)
  • (modified) mlir/include/mlir/IR/SymbolInterfaces.td (+2-2)
  • (modified) mlir/include/mlir/IR/TensorEncoding.td (+1-1)
  • (modified) mlir/include/mlir/IR/Verifier.h (+2-1)
  • (modified) mlir/include/mlir/IR/Visitors.h (-1)
  • (modified) mlir/include/mlir/Interfaces/DataLayoutInterfaces.td (+5-5)
  • (modified) mlir/include/mlir/Interfaces/FoldInterfaces.h (-1)
  • (modified) mlir/include/mlir/Interfaces/FunctionInterfaces.td (+2-2)
  • (modified) mlir/include/mlir/Interfaces/InferTypeOpInterface.td (+10-10)
  • (modified) mlir/include/mlir/Interfaces/LoopLikeInterface.td (+1-1)
  • (modified) mlir/include/mlir/Interfaces/MemorySlotInterfaces.td (+3-3)
  • (modified) mlir/include/mlir/Interfaces/TilingInterface.td (+10-10)
  • (modified) mlir/include/mlir/Pass/Pass.h (-1)
  • (modified) mlir/include/mlir/Pass/PassManager.h (-1)
  • (modified) mlir/include/mlir/Pass/PassOptions.h (-1)
  • (modified) mlir/include/mlir/Query/Query.h (+6-7)
  • (modified) mlir/include/mlir/Reducer/ReductionNode.h (-1)
  • (modified) mlir/include/mlir/Support/LLVM.h (+13-1)
  • (modified) mlir/include/mlir/Support/StorageUniquer.h (-1)
  • (modified) mlir/include/mlir/Support/ToolUtilities.h (-2)
  • (modified) mlir/include/mlir/Target/Cpp/CppEmitter.h (-1)
  • (modified) mlir/include/mlir/Target/LLVM/ROCDL/Utils.h (+1)
  • (modified) mlir/include/mlir/Target/LLVMIR/LLVMImportInterface.h (-1)
  • (modified) mlir/include/mlir/Target/LLVMIR/LLVMTranslationInterface.h (-1)
  • (modified) mlir/include/mlir/Target/SPIRV/Serialization.h (-1)
  • (modified) mlir/include/mlir/Tools/PDLL/AST/Diagnostic.h (-1)
  • (modified) mlir/include/mlir/Tools/PDLL/CodeGen/MLIRGen.h (-2)
  • (modified) mlir/include/mlir/Tools/PDLL/Parser/Parser.h (+1-1)
  • (modified) mlir/include/mlir/Tools/lsp-server-support/CompilationDatabase.h (+1)
  • (modified) mlir/include/mlir/Tools/lsp-server-support/Protocol.h (-3)
  • (modified) mlir/include/mlir/Tools/lsp-server-support/Transport.h (-1)
  • (modified) mlir/include/mlir/Tools/mlir-lsp-server/MlirLspServerMain.h (+6-3)
  • (modified) mlir/include/mlir/Tools/mlir-opt/MlirOptMain.h (-1)
  • (modified) mlir/include/mlir/Tools/mlir-pdll-lsp-server/MlirPdllLspServerMain.h (+4-2)
  • (modified) mlir/include/mlir/Tools/mlir-query/MlirQueryMain.h (+1-1)
  • (modified) mlir/include/mlir/Tools/mlir-reduce/MlirReduceMain.h (+1-1)
  • (modified) mlir/include/mlir/Tools/mlir-translate/MlirTranslateMain.h (+1-1)
  • (modified) mlir/include/mlir/Tools/tblgen-lsp-server/TableGenLspServerMain.h (+4-3)
  • (modified) mlir/include/mlir/Transforms/HomomorphismSimplification.h (-1)
  • (modified) mlir/include/mlir/Transforms/Inliner.h (-1)
  • (modified) mlir/include/mlir/Transforms/LocationSnapshot.h (-1)
  • (modified) mlir/include/mlir/Transforms/SROA.h (+1-1)
  • (modified) mlir/lib/Analysis/AliasAnalysis/LocalAliasAnalysis.cpp (-1)
  • (modified) mlir/lib/Analysis/DataFlow/ConstantPropagationAnalysis.cpp (-1)
  • (modified) mlir/lib/Analysis/DataFlow/DeadCodeAnalysis.cpp (-1)
  • (modified) mlir/lib/Analysis/DataFlow/DenseAnalysis.cpp (-1)
  • (modified) mlir/lib/Analysis/DataFlow/SparseAnalysis.cpp (-1)
  • (modified) mlir/lib/Analysis/DataFlowFramework.cpp (-1)
  • (modified) mlir/lib/Analysis/FlatLinearValueConstraints.cpp (-1)
  • (modified) mlir/lib/AsmParser/AffineParser.cpp (-1)
  • (modified) mlir/lib/AsmParser/AsmParserState.cpp (-1)
  • (modified) mlir/lib/AsmParser/DialectSymbolParser.cpp (-1)
  • (modified) mlir/lib/AsmParser/LocationParser.cpp (-1)
  • (modified) mlir/lib/AsmParser/Parser.cpp (-1)
  • (modified) mlir/lib/AsmParser/TypeParser.cpp (-1)
  • (modified) mlir/lib/Bytecode/Reader/BytecodeReader.cpp (-1)
  • (modified) mlir/lib/Bytecode/Writer/BytecodeWriter.cpp (-1)
  • (modified) mlir/lib/CAPI/IR/BuiltinTypes.cpp (-1)
  • (modified) mlir/lib/Conversion/ArithToAMDGPU/ArithToAMDGPU.cpp (-1)
  • (modified) mlir/lib/Conversion/ArithToEmitC/ArithToEmitC.cpp (-1)
  • (modified) mlir/lib/Conversion/BufferizationToMemRef/BufferizationToMemRef.cpp (-1)
  • (modified) mlir/lib/Conversion/ControlFlowToSPIRV/ControlFlowToSPIRV.cpp (-1)
  • (modified) mlir/lib/Conversion/FuncToLLVM/FuncToLLVM.cpp (-1)
  • (modified) mlir/lib/Conversion/FuncToSPIRV/FuncToSPIRV.cpp (-1)
  • (modified) mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRV.cpp (-1)
  • (modified) mlir/lib/Conversion/MemRefToSPIRV/MemRefToSPIRV.cpp (-1)
  • (modified) mlir/lib/Conversion/NVVMToLLVM/NVVMToLLVM.cpp (-1)
  • (modified) mlir/lib/Conversion/SPIRVToLLVM/SPIRVToLLVM.cpp (-1)
  • (modified) mlir/lib/Conversion/TensorToLinalg/TensorToLinalg.cpp (-1)
  • (modified) mlir/lib/Conversion/TensorToSPIRV/TensorToSPIRV.cpp (-1)
  • (modified) mlir/lib/Conversion/VectorToGPU/VectorToGPU.cpp (-1)
  • (modified) mlir/lib/Conversion/VectorToSPIRV/VectorToSPIRV.cpp (-1)
  • (modified) mlir/lib/Dialect/Affine/Transforms/AffineScalarReplacement.cpp (-1)
  • (modified) mlir/lib/Dialect/Arith/IR/ArithOps.cpp (-1)
  • (modified) mlir/lib/Dialect/Arith/Transforms/EmulateNarrowType.cpp (-1)
  • (modified) mlir/lib/Dialect/Arith/Transforms/EmulateWideInt.cpp (-1)
  • (modified) mlir/lib/Dialect/Arith/Transforms/IntNarrowing.cpp (-1)
  • (modified) mlir/lib/Dialect/ArmNeon/Transforms/LowerContractionToSMMLAPattern.cpp (-1)
  • (modified) mlir/lib/Dialect/Bufferization/Transforms/LowerDeallocations.cpp (-1)
  • (modified) mlir/lib/Dialect/GPU/IR/GPUDialect.cpp (-1)
  • (modified) mlir/lib/Dialect/GPU/Transforms/SubgroupReduceLowering.cpp (-1)
  • (modified) mlir/lib/Dialect/IRDL/IR/IRDL.cpp (-1)
  • (modified) mlir/lib/Dialect/IRDL/IRDLLoading.cpp (-1)
  • (modified) mlir/lib/Dialect/IRDL/IRDLVerifiers.cpp (-1)
  • (modified) mlir/lib/Dialect/LLVMIR/IR/BasicPtxBuilderInterface.cpp (-1)
  • (modified) mlir/lib/Dialect/LLVMIR/IR/NVVMDialect.cpp (-1)
  • (modified) mlir/lib/Dialect/Linalg/Transforms/MeshShardingInterfaceImpl.cpp (-1)
  • (modified) mlir/lib/Dialect/Linalg/Transforms/TransposeConv2D.cpp (-1)
  • (modified) mlir/lib/Dialect/MemRef/IR/MemRefMemorySlot.cpp (-1)
  • (modified) mlir/lib/Dialect/MemRef/Transforms/EmulateNarrowType.cpp (-1)
  • (modified) mlir/lib/Dialect/Mesh/IR/MeshOps.cpp (-1)
  • (modified) mlir/lib/Dialect/Mesh/Interfaces/ShardingInterface.cpp (-1)
  • (modified) mlir/lib/Dialect/Mesh/Transforms/ShardingPropagation.cpp (-1)
  • (modified) mlir/lib/Dialect/Mesh/Transforms/Simplifications.cpp (-1)
  • (modified) mlir/lib/Dialect/Mesh/Transforms/Spmdization.cpp (-1)
  • (modified) mlir/lib/Dialect/NVGPU/Transforms/MmaSyncTF32Transform.cpp (-1)
  • (modified) mlir/lib/Dialect/NVGPU/Transforms/OptimizeSharedMemory.cpp (+1-2)
  • (modified) mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp (-1)
  • (modified) mlir/lib/Dialect/Polynomial/IR/Polynomial.cpp (-1)
  • (modified) mlir/lib/Dialect/Polynomial/IR/PolynomialAttributes.cpp (-1)
  • (modified) mlir/lib/Dialect/Polynomial/IR/PolynomialDialect.cpp (-1)
  • (modified) mlir/lib/Dialect/Polynomial/IR/PolynomialOps.cpp (-1)
  • (modified) mlir/lib/Dialect/Quant/IR/QuantDialectBytecode.cpp (-1)
  • (modified) mlir/lib/Dialect/SPIRV/IR/SPIRVOps.cpp (-1)
  • (modified) mlir/lib/Dialect/SPIRV/Transforms/SPIRVWebGPUTransforms.cpp (-1)
  • (modified) mlir/lib/Dialect/Tosa/IR/TosaOps.cpp (+1-1)
  • (modified) mlir/lib/Dialect/Tosa/Transforms/TosaFolders.cpp (-1)
  • (modified) mlir/lib/Dialect/Transform/Interfaces/TransformInterfaces.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorBitCast.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorBroadcast.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorContract.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorGather.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorInterleave.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorScan.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorShapeCast.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorTranspose.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/VectorLinearize.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp (-1)
  • (modified) mlir/lib/IR/AffineMap.cpp (-1)
  • (modified) mlir/lib/IR/ExtensibleDialect.cpp (-1)
  • (modified) mlir/lib/Query/Query.cpp (+5-11)
  • (modified) mlir/lib/Support/ToolUtilities.cpp (-1)
  • (modified) mlir/lib/TableGen/CodeGenHelpers.cpp (+6-6)
  • (modified) mlir/lib/Target/LLVMIR/Dialect/GPU/SelectObjectAttr.cpp (+2-2)
  • (modified) mlir/lib/Target/LLVMIR/Dialect/NVVM/NVVMToLLVMIRTranslation.cpp (-1)
  • (modified) mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp (-1)
  • (modified) mlir/lib/Target/LLVMIR/ModuleTranslation.cpp (-1)
  • (modified) mlir/lib/Target/SPIRV/Deserialization/Deserializer.cpp (-1)
  • (modified) mlir/lib/Target/SPIRV/Serialization/SerializeOps.cpp (-1)
  • (modified) mlir/lib/Target/SPIRV/Serialization/Serializer.cpp (-1)
  • (modified) mlir/lib/Tools/PDLL/CodeGen/CPPGen.cpp (+1-1)
  • (modified) mlir/lib/Tools/PDLL/Parser/Lexer.cpp (-1)
  • (modified) mlir/lib/Tools/PDLL/Parser/Lexer.h (-2)
  • (modified) mlir/lib/Tools/PDLL/Parser/Parser.cpp (-1)
  • (modified) mlir/lib/Tools/lsp-server-support/Protocol.cpp (-1)
  • (modified) mlir/lib/Tools/mlir-lsp-server/LSPServer.h (+5-2)
  • (modified) mlir/lib/Tools/mlir-opt/MlirOptMain.cpp (-1)
  • (modified) mlir/lib/Tools/mlir-pdll-lsp-server/LSPServer.h (+5-2)
  • (modified) mlir/lib/Tools/mlir-pdll-lsp-server/PDLLServer.h (+2-1)
  • (modified) mlir/lib/Tools/mlir-query/MlirQueryMain.cpp (+1-2)
  • (modified) mlir/lib/Tools/mlir-reduce/MlirReduceMain.cpp (-1)
  • (modified) mlir/lib/Tools/mlir-translate/MlirTranslateMain.cpp (-1)
  • (modified) mlir/lib/Tools/tblgen-lsp-server/LSPServer.h (+5-3)
  • (modified) mlir/lib/Tools/tblgen-lsp-server/TableGenServer.cpp (-4)
  • (modified) mlir/lib/Tools/tblgen-lsp-server/TableGenServer.h (+2-1)
  • (modified) mlir/test/lib/Analysis/DataFlow/TestLivenessAnalysis.cpp (-1)
  • (modified) mlir/test/lib/Dialect/ArmNeon/TestLowerToArmNeon.cpp (-1)
  • (modified) mlir/test/lib/Dialect/Mesh/TestOpLowering.cpp (-1)
  • (modified) mlir/test/lib/Dialect/Mesh/TestReshardingSpmdization.cpp (-1)
  • (modified) mlir/test/lib/Dialect/Test/TestAttributes.cpp (-1)
  • (modified) mlir/test/lib/Dialect/Test/TestDialect.cpp (-1)
  • (modified) mlir/test/lib/Dialect/Test/TestOpDefs.cpp (+1-1)
  • (modified) mlir/test/lib/Dialect/Test/TestOps.h (+5-5)
  • (modified) mlir/test/lib/Dialect/Test/TestOps.td (+6-6)
  • (modified) mlir/test/lib/Dialect/Test/TestOpsSyntax.cpp (+1-1)
  • (modified) mlir/test/lib/Dialect/Test/TestOpsSyntax.td (+4-4)
  • (modified) mlir/test/lib/Dialect/Test/TestTypeDefs.td (+1-1)
  • (modified) mlir/test/lib/Dialect/Test/TestTypes.h (+2-2)
  • (modified) mlir/test/mlir-pdll/CodeGen/CPP/general.pdll (+1-1)
  • (modified) mlir/test/mlir-tblgen/attrdefs.td (+1-1)
  • (modified) mlir/test/mlir-tblgen/constraint-unique.td (+9-9)
  • (modified) mlir/test/mlir-tblgen/interfaces-as-constraints.td (+4-4)
  • (modified) mlir/test/mlir-tblgen/op-attribute.td (+2-2)
  • (modified) mlir/test/mlir-tblgen/op-decl-and-defs.td (+5-5)
  • (modified) mlir/test/mlir-tblgen/predicate.td (+3-3)
  • (modified) mlir/test/mlir-tblgen/rewriter-static-matcher.td (+3-3)
  • (modified) mlir/test/mlir-tblgen/typedefs.td (+1-1)
  • (modified) mlir/test/python/python_test_ops.td (+3-3)
  • (modified) mlir/tools/mlir-pdll-lsp-server/mlir-pdll-lsp-server.cpp (+1-1)
diff --git a/flang/include/flang/Optimizer/CodeGen/FIROpPatterns.h b/flang/include/flang/Optimizer/CodeGen/FIROpPatterns.h
index ac095664f6188..91b2025176770 100644
--- a/flang/include/flang/Optimizer/CodeGen/FIROpPatterns.h
+++ b/flang/include/flang/Optimizer/CodeGen/FIROpPatterns.h
@@ -205,10 +205,10 @@ class FIROpConversion : public ConvertFIRToLLVMPattern {
     rewrite(mlir::cast<SourceOp>(op),
             OpAdaptor(operands, mlir::cast<SourceOp>(op)), rewriter);
   }
-  mlir::LogicalResult match(mlir::Operation *op) const final {
+  llvm::LogicalResult match(mlir::Operation *op) const final {
     return match(mlir::cast<SourceOp>(op));
   }
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(mlir::Operation *op, mlir::ArrayRef<mlir::Value> operands,
                   mlir::ConversionPatternRewriter &rewriter) const final {
     return matchAndRewrite(mlir::cast<SourceOp>(op),
@@ -218,14 +218,14 @@ class FIROpConversion : public ConvertFIRToLLVMPattern {
 
   /// Rewrite and Match methods that operate on the SourceOp type. These must be
   /// overridden by the derived pattern class.
-  virtual mlir::LogicalResult match(SourceOp op) const {
+  virtual llvm::LogicalResult match(SourceOp op) const {
     llvm_unreachable("must override match or matchAndRewrite");
   }
   virtual void rewrite(SourceOp op, OpAdaptor adaptor,
                        mlir::ConversionPatternRewriter &rewriter) const {
     llvm_unreachable("must override rewrite or matchAndRewrite");
   }
-  virtual mlir::LogicalResult
+  virtual llvm::LogicalResult
   matchAndRewrite(SourceOp op, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const {
     if (mlir::failed(match(op)))
@@ -246,14 +246,14 @@ class FIROpAndTypeConversion : public FIROpConversion<FromOp> {
   using FIROpConversion<FromOp>::FIROpConversion;
   using OpAdaptor = typename FromOp::Adaptor;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(FromOp op, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const final {
     mlir::Type ty = this->convertType(op.getType());
     return doRewrite(op, ty, adaptor, rewriter);
   }
 
-  virtual mlir::LogicalResult
+  virtual llvm::LogicalResult
   doRewrite(FromOp addr, mlir::Type ty, OpAdaptor adaptor,
             mlir::ConversionPatternRewriter &rewriter) const = 0;
 };
diff --git a/flang/include/flang/Optimizer/CodeGen/TypeConverter.h b/flang/include/flang/Optimizer/CodeGen/TypeConverter.h
index 58803a5cc4044..ece3e4e073f68 100644
--- a/flang/include/flang/Optimizer/CodeGen/TypeConverter.h
+++ b/flang/include/flang/Optimizer/CodeGen/TypeConverter.h
@@ -60,7 +60,7 @@ class LLVMTypeConverter : public mlir::LLVMTypeConverter {
   mlir::Type indexType() const;
 
   // fir.type<name(p : TY'...){f : TY...}>  -->  llvm<"%name = { ty... }">
-  std::optional<mlir::LogicalResult>
+  std::optional<llvm::LogicalResult>
   convertRecordType(fir::RecordType derived,
                     llvm::SmallVectorImpl<mlir::Type> &results);
 
diff --git a/flang/include/flang/Optimizer/Dialect/FirAliasTagOpInterface.h b/flang/include/flang/Optimizer/Dialect/FirAliasTagOpInterface.h
index f2d5b39acf3a7..1e3728e735145 100644
--- a/flang/include/flang/Optimizer/Dialect/FirAliasTagOpInterface.h
+++ b/flang/include/flang/Optimizer/Dialect/FirAliasTagOpInterface.h
@@ -16,10 +16,10 @@
 
 #include "mlir/IR/OpDefinition.h"
 #include "mlir/IR/Operation.h"
-#include "mlir/Support/LogicalResult.h"
+#include "llvm/Support/LogicalResult.h"
 
 namespace fir::detail {
-mlir::LogicalResult verifyFirAliasTagOpInterface(mlir::Operation *op);
+llvm::LogicalResult verifyFirAliasTagOpInterface(mlir::Operation *op);
 } // namespace fir::detail
 
 #include "flang/Optimizer/Dialect/FirAliasTagOpInterface.h.inc"
diff --git a/flang/include/flang/Optimizer/Dialect/FortranVariableInterface.td b/flang/include/flang/Optimizer/Dialect/FortranVariableInterface.td
index 3f78a93a2515e..926e00ca04340 100644
--- a/flang/include/flang/Optimizer/Dialect/FortranVariableInterface.td
+++ b/flang/include/flang/Optimizer/Dialect/FortranVariableInterface.td
@@ -192,7 +192,7 @@ def fir_FortranVariableOpInterface : OpInterface<"FortranVariableOpInterface"> {
     }
 
     /// Interface verifier imlementation for declare operations.
-    mlir::LogicalResult verifyDeclareLikeOpImpl(mlir::Value memRef);
+    llvm::LogicalResult verifyDeclareLikeOpImpl(mlir::Value memRef);
 
   }];
 
diff --git a/flang/include/flang/Optimizer/Dialect/Support/KindMapping.h b/flang/include/flang/Optimizer/Dialect/Support/KindMapping.h
index 138123b7b48ba..083526fcbac94 100644
--- a/flang/include/flang/Optimizer/Dialect/Support/KindMapping.h
+++ b/flang/include/flang/Optimizer/Dialect/Support/KindMapping.h
@@ -124,7 +124,7 @@ class KindMapping {
 private:
   MatchResult badMapString(const llvm::Twine &ptr);
   MatchResult parse(llvm::StringRef kindMap);
-  mlir::LogicalResult setDefaultKinds(llvm::ArrayRef<KindTy> defs);
+  llvm::LogicalResult setDefaultKinds(llvm::ArrayRef<KindTy> defs);
 
   mlir::MLIRContext *context;
   llvm::DenseMap<std::pair<char, KindTy>, Bitsize> intMap;
diff --git a/flang/include/flang/Optimizer/HLFIR/HLFIROps.td b/flang/include/flang/Optimizer/HLFIR/HLFIROps.td
index e9915e899c2c9..fdf0db9d3c75d 100644
--- a/flang/include/flang/Optimizer/HLFIR/HLFIROps.td
+++ b/flang/include/flang/Optimizer/HLFIR/HLFIROps.td
@@ -733,7 +733,7 @@ def hlfir_AssociateOp : hlfir_Op<"associate", [AttrSizedOperandSegments,
       CArg<"mlir::Value", "{}">:$shape, CArg<"mlir::ValueRange", "{}">:$typeparams,
       CArg<"fir::FortranVariableFlagsAttr", "{}">:$fortran_attrs)>,
     OpBuilder<(ins "mlir::Value":$memref, CArg<"mlir::Value", "{}">:$shape,
-      CArg<"mlir::ValueRange", "{}">:$typeparams, 
+      CArg<"mlir::ValueRange", "{}">:$typeparams,
       CArg<"fir::FortranVariableFlagsAttr", "{}">:$fortran_attrs,
       CArg<"llvm::ArrayRef<mlir::NamedAttribute>", "{}">:$attributes)>];
 
@@ -1258,7 +1258,7 @@ def hlfir_OrderedAssignmentTreeOpInterface : OpInterface<"OrderedAssignmentTreeO
 
   let extraClassDeclaration = [{
     /// Interface verifier imlementation.
-    mlir::LogicalResult verifyImpl();
+    llvm::LogicalResult verifyImpl();
 
     mlir::Block* getSubTreeBlock() {
       mlir::Region* region = getSubTreeRegion();
@@ -1733,8 +1733,8 @@ def hlfir_CharExtremumOp : hlfir_Op<"char_extremum",
     [DeclareOpInterfaceMethods<MemoryEffectsOpInterface>]> {
   let summary = "Find max/min from given character strings";
   let description = [{
-    Find the lexicographical minimum or maximum of two or more character 
-    strings of the same character kind and return the string with the lexicographical 
+    Find the lexicographical minimum or maximum of two or more character
+    strings of the same character kind and return the string with the lexicographical
     minimum or maximum number of characters. Example:
 
     %0 = hlfir.char_extremum min, %arg0, %arg1 : (!fir.ref<!fir.char<1,10>>, !fir.ref<!fir.char<1,20>>) -> !hlfir.expr<!fir.char<1,10>>
diff --git a/flang/lib/Optimizer/CodeGen/CodeGen.cpp b/flang/lib/Optimizer/CodeGen/CodeGen.cpp
index 5f35825783c51..7483acfcd1ca7 100644
--- a/flang/lib/Optimizer/CodeGen/CodeGen.cpp
+++ b/flang/lib/Optimizer/CodeGen/CodeGen.cpp
@@ -113,7 +113,7 @@ namespace {
 struct AddrOfOpConversion : public fir::FIROpConversion<fir::AddrOfOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::AddrOfOp addr, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     auto ty = convertType(addr.getType());
@@ -174,7 +174,7 @@ namespace {
 struct DeclareOpConversion : public fir::FIROpConversion<fir::cg::XDeclareOp> {
 public:
   using FIROpConversion::FIROpConversion;
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::cg::XDeclareOp declareOp, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     auto memRef = adaptor.getOperands()[0];
@@ -197,7 +197,7 @@ namespace {
 struct AllocaOpConversion : public fir::FIROpConversion<fir::AllocaOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::AllocaOp alloc, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::ValueRange operands = adaptor.getOperands();
@@ -294,7 +294,7 @@ namespace {
 struct BoxAddrOpConversion : public fir::FIROpConversion<fir::BoxAddrOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxAddrOp boxaddr, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value a = adaptor.getOperands()[0];
@@ -316,7 +316,7 @@ struct BoxAddrOpConversion : public fir::FIROpConversion<fir::BoxAddrOp> {
 struct BoxCharLenOpConversion : public fir::FIROpConversion<fir::BoxCharLenOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxCharLenOp boxCharLen, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value boxChar = adaptor.getOperands()[0];
@@ -339,7 +339,7 @@ struct BoxCharLenOpConversion : public fir::FIROpConversion<fir::BoxCharLenOp> {
 struct BoxDimsOpConversion : public fir::FIROpConversion<fir::BoxDimsOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxDimsOp boxdims, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     llvm::SmallVector<mlir::Type, 3> resultTypes = {
@@ -361,7 +361,7 @@ struct BoxDimsOpConversion : public fir::FIROpConversion<fir::BoxDimsOp> {
 struct BoxEleSizeOpConversion : public fir::FIROpConversion<fir::BoxEleSizeOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxEleSizeOp boxelesz, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value box = adaptor.getOperands()[0];
@@ -379,7 +379,7 @@ struct BoxEleSizeOpConversion : public fir::FIROpConversion<fir::BoxEleSizeOp> {
 struct BoxIsAllocOpConversion : public fir::FIROpConversion<fir::BoxIsAllocOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxIsAllocOp boxisalloc, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value box = adaptor.getOperands()[0];
@@ -397,7 +397,7 @@ struct BoxIsAllocOpConversion : public fir::FIROpConversion<fir::BoxIsAllocOp> {
 struct BoxIsArrayOpConversion : public fir::FIROpConversion<fir::BoxIsArrayOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxIsArrayOp boxisarray, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value a = adaptor.getOperands()[0];
@@ -416,7 +416,7 @@ struct BoxIsArrayOpConversion : public fir::FIROpConversion<fir::BoxIsArrayOp> {
 struct BoxIsPtrOpConversion : public fir::FIROpConversion<fir::BoxIsPtrOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxIsPtrOp boxisptr, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value box = adaptor.getOperands()[0];
@@ -434,7 +434,7 @@ struct BoxIsPtrOpConversion : public fir::FIROpConversion<fir::BoxIsPtrOp> {
 struct BoxRankOpConversion : public fir::FIROpConversion<fir::BoxRankOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxRankOp boxrank, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value a = adaptor.getOperands()[0];
@@ -456,7 +456,7 @@ struct BoxProcHostOpConversion
     : public fir::FIROpConversion<fir::BoxProcHostOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxProcHostOp boxprochost, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     TODO(boxprochost.getLoc(), "fir.boxproc_host codegen");
@@ -470,7 +470,7 @@ struct BoxTypeDescOpConversion
     : public fir::FIROpConversion<fir::BoxTypeDescOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxTypeDescOp boxtypedesc, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value box = adaptor.getOperands()[0];
@@ -488,7 +488,7 @@ struct BoxTypeCodeOpConversion
     : public fir::FIROpConversion<fir::BoxTypeCodeOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxTypeCodeOp op, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value box = adaptor.getOperands()[0];
@@ -506,7 +506,7 @@ struct BoxTypeCodeOpConversion
 struct StringLitOpConversion : public fir::FIROpConversion<fir::StringLitOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::StringLitOp constop, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     auto ty = convertType(constop.getType());
@@ -547,7 +547,7 @@ struct StringLitOpConversion : public fir::FIROpConversion<fir::StringLitOp> {
 struct CallOpConversion : public fir::FIROpConversion<fir::CallOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::CallOp call, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     llvm::SmallVector<mlir::Type> resultTys;
@@ -578,7 +578,7 @@ namespace {
 struct CmpcOpConversion : public fir::FIROpConversion<fir::CmpcOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::CmpcOp cmp, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::ValueRange operands = adaptor.getOperands();
@@ -616,7 +616,7 @@ struct CmpcOpConversion : public fir::FIROpConversion<fir::CmpcOp> {
 struct ConstcOpConversion : public fir::FIROpConversion<fir::ConstcOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::ConstcOp conc, OpAdaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Location loc = conc.getLoc();
@@ -647,7 +647,7 @@ struct ConvertOpConversion : public fir::FIROpConversion<fir::ConvertOp> {
     return mlir::isa<mlir::FloatType>(ty);
   }
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::ConvertOp convert, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     auto fromFirTy = convert.getValue().getType();
@@ -814,7 +814,7 @@ struct ConvertOpConversion : public fir::FIROpConversion<fir::ConvertOp> {
 struct TypeInfoOpConversion : public fir::FIROpConversion<fir::TypeInfoOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::TypeInfoOp op, OpAdaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     rewriter.eraseOp(op);
@@ -827,7 +827,7 @@ struct TypeInfoOpConversion : public fir::FIROpConversion<fir::TypeInfoOp> {
 struct DTEntryOpConversion : public fir::FIROpConversion<fir::DTEntryOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::DTEntryOp op, OpAdaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     rewriter.eraseOp(op);
@@ -839,7 +839,7 @@ struct DTEntryOpConversion : public fir::FIROpConversion<fir::DTEntryOp> {
 struct GlobalLenOpConversion : public fir::FIROpConversion<fir::GlobalLenOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::GlobalLenOp globalLen, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     TODO(globalLen.getLoc(), "fir.global_len codegen");
@@ -853,7 +853,7 @@ struct LenParamIndexOpConversion
   using FIROpConversion::FIROpConversion;
 
   // FIXME: this should be specialized by the runtime target
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::LenParamIndexOp lenp, OpAdaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     TODO(lenp.getLoc(), "fir.len_param_index codegen");
@@ -867,7 +867,7 @@ struct LenParamIndexOpConversion
 struct EmboxCharOpConversion : public fir::FIROpConversion<fir::EmboxCharOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::EmboxCharOp emboxChar, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::ValueRange operands = adaptor.getOperands();
@@ -960,7 +960,7 @@ namespace {
 struct AllocMemOpConversion : public fir::FIROpConversion<fir::AllocMemOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::AllocMemOp heap, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Type heapTy = heap.getType();
@@ -1030,7 +1030,7 @@ namespace {
 struct FreeMemOpConversion : public fir::FIROpConversion<fir::FreeMemOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::FreeMemOp freemem, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Location loc = freemem.getLoc();
@@ -1481,7 +1481,7 @@ computeTripletExtent(mlir::ConversionPatternRewriter &rewriter,
 struct EmboxOpConversion : public EmboxCommonConversion<fir::EmboxOp> {
   using EmboxCommonConversion::EmboxCommonConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::EmboxOp embox, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::ValueRange operands = adaptor.getOperands();
@@ -1513,7 +1513,7 @@ struct EmboxOpConversion : public EmboxCommonConversion<fir::EmboxOp> {
 struct XEmboxOpConversion : public EmboxCommonConversion<fir::cg::XEmboxOp> {
   using EmboxCommonConversion::EmboxCommonConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::cg::XEmboxOp xbox, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::ValueRange operands = adaptor.getOperands();
@@ -1711,7 +1711,7 @@ struct XEmboxOpConversion : public EmboxCommonConversion<fir::cg::XEmboxOp> {
 struct XReboxOpConversion : public EmboxCommonConversion<fir::cg::XReboxOp> {
   using EmboxCommonConversion::EmboxCommonConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::cg::XReboxOp rebox, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Location loc = rebox.getLoc();
@@ -1794,7 +1794,7 @@ struct XReboxOpConversion : public EmboxCommonConversion<fir::cg::XReboxOp> {
 private:
   /// Write resulting shape and base address in descriptor, and replace rebox
   /// op.
-  mlir::LogicalResult
+  llvm::LogicalResult
   finalizeRebox(fir::cg::XReboxOp rebox, mlir::Type destBoxTy, mlir::Value dest,
                 mlir::Value base, mlir::ValueRange lbounds,
                 mlir::ValueRange extents, mlir::ValueRange strides,
@@ -1825,7 +1825,7 @@ struct XReboxOpConversion : public EmboxCommonConversion<fir::cg::XReboxOp> {
   }
 
   // Apply slice given the base address, extents and strides of the input box.
-  mlir::LogicalResult
+  llvm::LogicalResult
   sliceBox(fir::cg::XReboxOp rebox, mlir::Type destBoxTy, mlir::Value dest,
            mlir::Value base, mlir::ValueRange inputExtents,
    ...
[truncated]

@llvmbot
Copy link
Member

llvmbot commented Jul 1, 2024

@llvm/pr-subscribers-mlir-core

Author: Ramkumar Ramachandra (artagnon)

Changes

This patch is part of a project to move the Presburger library into LLVM.


Patch is 352.44 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/97309.diff

314 Files Affected:

  • (modified) flang/include/flang/Optimizer/CodeGen/FIROpPatterns.h (+6-6)
  • (modified) flang/include/flang/Optimizer/CodeGen/TypeConverter.h (+1-1)
  • (modified) flang/include/flang/Optimizer/Dialect/FirAliasTagOpInterface.h (+2-2)
  • (modified) flang/include/flang/Optimizer/Dialect/FortranVariableInterface.td (+1-1)
  • (modified) flang/include/flang/Optimizer/Dialect/Support/KindMapping.h (+1-1)
  • (modified) flang/include/flang/Optimizer/HLFIR/HLFIROps.td (+4-4)
  • (modified) flang/lib/Optimizer/CodeGen/CodeGen.cpp (+69-69)
  • (modified) flang/lib/Optimizer/CodeGen/CodeGenOpenMP.cpp (+1-1)
  • (modified) flang/lib/Optimizer/CodeGen/PreCGRewrite.cpp (+7-7)
  • (modified) flang/lib/Optimizer/CodeGen/TargetRewrite.cpp (+1-1)
  • (modified) flang/lib/Optimizer/CodeGen/TypeConverter.cpp (+1-1)
  • (modified) flang/lib/Optimizer/Dialect/CUF/CUFOps.cpp (+7-7)
  • (modified) flang/lib/Optimizer/Dialect/FIROps.cpp (+43-43)
  • (modified) flang/lib/Optimizer/Dialect/FIRType.cpp (+11-11)
  • (modified) flang/lib/Optimizer/Dialect/FirAliasTagOpInterface.cpp (+3-3)
  • (modified) flang/lib/Optimizer/Dialect/FortranVariableInterface.cpp (+1-1)
  • (modified) flang/lib/Optimizer/Dialect/Support/KindMapping.cpp (+2-2)
  • (modified) flang/lib/Optimizer/HLFIR/IR/HLFIROps.cpp (+42-42)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/BufferizeHLFIR.cpp (+13-14)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/ConvertToFIR.cpp (+9-9)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/InlineElementals.cpp (+1-1)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/LowerHLFIRIntrinsics.cpp (+6-7)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/LowerHLFIROrderedAssignments.cpp (+4-4)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/OptimizedBufferization.cpp (+8-8)
  • (modified) flang/lib/Optimizer/HLFIR/Transforms/SimplifyHLFIRIntrinsics.cpp (+1-1)
  • (modified) flang/lib/Optimizer/Transforms/AbstractResult.cpp (+5-5)
  • (modified) flang/lib/Optimizer/Transforms/AffineDemotion.cpp (+2-2)
  • (modified) flang/lib/Optimizer/Transforms/AffinePromotion.cpp (+2-2)
  • (modified) flang/lib/Optimizer/Transforms/ArrayValueCopy.cpp (+7-7)
  • (modified) flang/lib/Optimizer/Transforms/AssumedRankOpConversion.cpp (+2-2)
  • (modified) flang/lib/Optimizer/Transforms/CharacterConversion.cpp (+1-1)
  • (modified) flang/lib/Optimizer/Transforms/ConstantArgumentGlobalisation.cpp (+1-1)
  • (modified) flang/lib/Optimizer/Transforms/ControlFlowConverter.cpp (+3-3)
  • (modified) flang/lib/Optimizer/Transforms/MemoryAllocation.cpp (+1-1)
  • (modified) flang/lib/Optimizer/Transforms/PolymorphicOpConversion.cpp (+7-7)
  • (modified) flang/lib/Optimizer/Transforms/StackArrays.cpp (+4-5)
  • (modified) flang/tools/bbc/bbc.cpp (+2-2)
  • (modified) flang/tools/tco/tco.cpp (+1-1)
  • (renamed) llvm/include/llvm/Support/LogicalResult.h (+33-36)
  • (modified) mlir/docs/PDLL.md (+7-7)
  • (modified) mlir/docs/Tutorials/Toy/Ch-2.md (+3-3)
  • (modified) mlir/docs/Tutorials/Toy/Ch-3.md (+3-3)
  • (modified) mlir/docs/Tutorials/Toy/Ch-5.md (+1-1)
  • (modified) mlir/examples/standalone/lib/Standalone/StandalonePasses.cpp (-1)
  • (modified) mlir/examples/standalone/standalone-translate/standalone-translate.cpp (+1-2)
  • (modified) mlir/examples/toy/Ch2/mlir/Dialect.cpp (+3-4)
  • (modified) mlir/examples/toy/Ch2/mlir/MLIRGen.cpp (+4-5)
  • (modified) mlir/examples/toy/Ch3/mlir/Dialect.cpp (+3-4)
  • (modified) mlir/examples/toy/Ch3/mlir/MLIRGen.cpp (+4-5)
  • (modified) mlir/examples/toy/Ch3/mlir/ToyCombine.cpp (+1-2)
  • (modified) mlir/examples/toy/Ch3/toyc.cpp (-1)
  • (modified) mlir/examples/toy/Ch4/mlir/Dialect.cpp (+3-4)
  • (modified) mlir/examples/toy/Ch4/mlir/MLIRGen.cpp (+4-5)
  • (modified) mlir/examples/toy/Ch4/mlir/ToyCombine.cpp (+1-2)
  • (modified) mlir/examples/toy/Ch4/toyc.cpp (-1)
  • (modified) mlir/examples/toy/Ch5/mlir/Dialect.cpp (+3-4)
  • (modified) mlir/examples/toy/Ch5/mlir/LowerToAffineLoops.cpp (-1)
  • (modified) mlir/examples/toy/Ch5/mlir/MLIRGen.cpp (+4-5)
  • (modified) mlir/examples/toy/Ch5/mlir/ToyCombine.cpp (+1-2)
  • (modified) mlir/examples/toy/Ch5/toyc.cpp (-1)
  • (modified) mlir/examples/toy/Ch6/mlir/Dialect.cpp (+3-4)
  • (modified) mlir/examples/toy/Ch6/mlir/LowerToAffineLoops.cpp (-1)
  • (modified) mlir/examples/toy/Ch6/mlir/LowerToLLVM.cpp (-1)
  • (modified) mlir/examples/toy/Ch6/mlir/MLIRGen.cpp (+4-5)
  • (modified) mlir/examples/toy/Ch6/mlir/ToyCombine.cpp (+1-2)
  • (modified) mlir/examples/toy/Ch6/toyc.cpp (-1)
  • (modified) mlir/examples/toy/Ch7/mlir/Dialect.cpp (+6-7)
  • (modified) mlir/examples/toy/Ch7/mlir/LowerToAffineLoops.cpp (-1)
  • (modified) mlir/examples/toy/Ch7/mlir/LowerToLLVM.cpp (-1)
  • (modified) mlir/examples/toy/Ch7/mlir/MLIRGen.cpp (+5-6)
  • (modified) mlir/examples/toy/Ch7/mlir/ToyCombine.cpp (+1-2)
  • (modified) mlir/examples/toy/Ch7/toyc.cpp (-1)
  • (modified) mlir/examples/transform-opt/mlir-transform-opt.cpp (+5-5)
  • (modified) mlir/examples/transform/Ch4/lib/MyExtension.cpp (+1-1)
  • (modified) mlir/include/mlir/Analysis/FlatLinearValueConstraints.h (-1)
  • (modified) mlir/include/mlir/Bytecode/BytecodeImplementation.h (-1)
  • (modified) mlir/include/mlir/Bytecode/BytecodeOpInterface.h (-1)
  • (modified) mlir/include/mlir/Bytecode/BytecodeReader.h (-1)
  • (modified) mlir/include/mlir/Bytecode/BytecodeReaderConfig.h (-1)
  • (modified) mlir/include/mlir/CAPI/Support.h (+3-3)
  • (modified) mlir/include/mlir/Conversion/AffineToStandard/AffineToStandard.h (-1)
  • (modified) mlir/include/mlir/Conversion/ConvertToLLVM/ToLLVMInterface.h (-1)
  • (modified) mlir/include/mlir/Conversion/FuncToLLVM/ConvertFuncToLLVM.h (-1)
  • (modified) mlir/include/mlir/Conversion/GPUCommon/GPUCommonPass.h (-1)
  • (modified) mlir/include/mlir/Conversion/SCFToGPU/SCFToGPU.h (-1)
  • (modified) mlir/include/mlir/Conversion/VectorToGPU/VectorToGPU.h (-1)
  • (modified) mlir/include/mlir/Debug/CLOptionsSetup.h (-1)
  • (modified) mlir/include/mlir/Dialect/AMDGPU/Utils/Chipset.h (+1-1)
  • (modified) mlir/include/mlir/Dialect/Affine/Analysis/AffineStructures.h (-1)
  • (modified) mlir/include/mlir/Dialect/Affine/IR/ValueBoundsOpInterfaceImpl.h (+1-1)
  • (modified) mlir/include/mlir/Dialect/Affine/LoopUtils.h (-1)
  • (modified) mlir/include/mlir/Dialect/Affine/Transforms/Transforms.h (-1)
  • (modified) mlir/include/mlir/Dialect/Affine/Utils.h (-2)
  • (modified) mlir/include/mlir/Dialect/Arith/Transforms/Transforms.h (-1)
  • (modified) mlir/include/mlir/Dialect/Bufferization/IR/BufferizableOpInterface.td (+4-4)
  • (modified) mlir/include/mlir/Dialect/Bufferization/Transforms/OneShotModuleBufferize.h (+11-8)
  • (modified) mlir/include/mlir/Dialect/GPU/IR/CompilationAttrInterfaces.td (+2-2)
  • (modified) mlir/include/mlir/Dialect/GPU/Transforms/ParallelLoopMapper.h (-1)
  • (modified) mlir/include/mlir/Dialect/GPU/Transforms/Utils.h (-1)
  • (modified) mlir/include/mlir/Dialect/IRDL/IR/IRDLInterfaces.h (-1)
  • (modified) mlir/include/mlir/Dialect/IRDL/IR/IRDLTraits.h (-1)
  • (modified) mlir/include/mlir/Dialect/IRDL/IRDLLoading.h (+6-2)
  • (modified) mlir/include/mlir/Dialect/IRDL/IRDLVerifiers.h (-1)
  • (modified) mlir/include/mlir/Dialect/Linalg/TransformOps/GPUHeuristics.h (-1)
  • (modified) mlir/include/mlir/Dialect/Linalg/TransformOps/Syntax.h (-1)
  • (modified) mlir/include/mlir/Dialect/Linalg/Transforms/Transforms.h (-1)
  • (modified) mlir/include/mlir/Dialect/MemRef/Transforms/Transforms.h (+1-1)
  • (modified) mlir/include/mlir/Dialect/Mesh/Transforms/Spmdization.h (-1)
  • (modified) mlir/include/mlir/Dialect/NVGPU/Transforms/Transforms.h (+1-2)
  • (modified) mlir/include/mlir/Dialect/OpenACCMPCommon/Interfaces/AtomicInterfaces.td (+12-12)
  • (modified) mlir/include/mlir/Dialect/Polynomial/IR/Polynomial.h (-1)
  • (modified) mlir/include/mlir/Dialect/SCF/Transforms/Transforms.h (-2)
  • (modified) mlir/include/mlir/Dialect/SCF/Utils/AffineCanonicalizationUtils.h (-2)
  • (modified) mlir/include/mlir/Dialect/SCF/Utils/Utils.h (-1)
  • (modified) mlir/include/mlir/Dialect/SparseTensor/IR/SparseTensorInterfaces.td (+1-1)
  • (modified) mlir/include/mlir/Dialect/Transform/Interfaces/TransformInterfaces.h (+1-2)
  • (modified) mlir/include/mlir/Dialect/Transform/Interfaces/TransformInterfaces.td (+1-1)
  • (modified) mlir/include/mlir/Dialect/Transform/Transforms/TransformInterpreterUtils.h (-1)
  • (modified) mlir/include/mlir/Dialect/Vector/Transforms/VectorRewritePatterns.h (-1)
  • (modified) mlir/include/mlir/ExecutionEngine/JitRunner.h (+3-3)
  • (modified) mlir/include/mlir/IR/Action.h (-1)
  • (modified) mlir/include/mlir/IR/AffineExpr.h (-1)
  • (modified) mlir/include/mlir/IR/AffineExprVisitor.h (+1-1)
  • (modified) mlir/include/mlir/IR/AffineMap.h (-1)
  • (modified) mlir/include/mlir/IR/BuiltinAttributeInterfaces.h (-1)
  • (modified) mlir/include/mlir/IR/BuiltinAttributeInterfaces.td (+1-1)
  • (modified) mlir/include/mlir/IR/Diagnostics.h (-1)
  • (modified) mlir/include/mlir/IR/Dialect.h (-3)
  • (modified) mlir/include/mlir/IR/EnumAttr.td (+2-2)
  • (modified) mlir/include/mlir/IR/ExtensibleDialect.h (-1)
  • (modified) mlir/include/mlir/IR/OperationSupport.h (-1)
  • (modified) mlir/include/mlir/IR/StorageUniquerSupport.h (-1)
  • (modified) mlir/include/mlir/IR/SymbolInterfaces.td (+2-2)
  • (modified) mlir/include/mlir/IR/TensorEncoding.td (+1-1)
  • (modified) mlir/include/mlir/IR/Verifier.h (+2-1)
  • (modified) mlir/include/mlir/IR/Visitors.h (-1)
  • (modified) mlir/include/mlir/Interfaces/DataLayoutInterfaces.td (+5-5)
  • (modified) mlir/include/mlir/Interfaces/FoldInterfaces.h (-1)
  • (modified) mlir/include/mlir/Interfaces/FunctionInterfaces.td (+2-2)
  • (modified) mlir/include/mlir/Interfaces/InferTypeOpInterface.td (+10-10)
  • (modified) mlir/include/mlir/Interfaces/LoopLikeInterface.td (+1-1)
  • (modified) mlir/include/mlir/Interfaces/MemorySlotInterfaces.td (+3-3)
  • (modified) mlir/include/mlir/Interfaces/TilingInterface.td (+10-10)
  • (modified) mlir/include/mlir/Pass/Pass.h (-1)
  • (modified) mlir/include/mlir/Pass/PassManager.h (-1)
  • (modified) mlir/include/mlir/Pass/PassOptions.h (-1)
  • (modified) mlir/include/mlir/Query/Query.h (+6-7)
  • (modified) mlir/include/mlir/Reducer/ReductionNode.h (-1)
  • (modified) mlir/include/mlir/Support/LLVM.h (+13-1)
  • (modified) mlir/include/mlir/Support/StorageUniquer.h (-1)
  • (modified) mlir/include/mlir/Support/ToolUtilities.h (-2)
  • (modified) mlir/include/mlir/Target/Cpp/CppEmitter.h (-1)
  • (modified) mlir/include/mlir/Target/LLVM/ROCDL/Utils.h (+1)
  • (modified) mlir/include/mlir/Target/LLVMIR/LLVMImportInterface.h (-1)
  • (modified) mlir/include/mlir/Target/LLVMIR/LLVMTranslationInterface.h (-1)
  • (modified) mlir/include/mlir/Target/SPIRV/Serialization.h (-1)
  • (modified) mlir/include/mlir/Tools/PDLL/AST/Diagnostic.h (-1)
  • (modified) mlir/include/mlir/Tools/PDLL/CodeGen/MLIRGen.h (-2)
  • (modified) mlir/include/mlir/Tools/PDLL/Parser/Parser.h (+1-1)
  • (modified) mlir/include/mlir/Tools/lsp-server-support/CompilationDatabase.h (+1)
  • (modified) mlir/include/mlir/Tools/lsp-server-support/Protocol.h (-3)
  • (modified) mlir/include/mlir/Tools/lsp-server-support/Transport.h (-1)
  • (modified) mlir/include/mlir/Tools/mlir-lsp-server/MlirLspServerMain.h (+6-3)
  • (modified) mlir/include/mlir/Tools/mlir-opt/MlirOptMain.h (-1)
  • (modified) mlir/include/mlir/Tools/mlir-pdll-lsp-server/MlirPdllLspServerMain.h (+4-2)
  • (modified) mlir/include/mlir/Tools/mlir-query/MlirQueryMain.h (+1-1)
  • (modified) mlir/include/mlir/Tools/mlir-reduce/MlirReduceMain.h (+1-1)
  • (modified) mlir/include/mlir/Tools/mlir-translate/MlirTranslateMain.h (+1-1)
  • (modified) mlir/include/mlir/Tools/tblgen-lsp-server/TableGenLspServerMain.h (+4-3)
  • (modified) mlir/include/mlir/Transforms/HomomorphismSimplification.h (-1)
  • (modified) mlir/include/mlir/Transforms/Inliner.h (-1)
  • (modified) mlir/include/mlir/Transforms/LocationSnapshot.h (-1)
  • (modified) mlir/include/mlir/Transforms/SROA.h (+1-1)
  • (modified) mlir/lib/Analysis/AliasAnalysis/LocalAliasAnalysis.cpp (-1)
  • (modified) mlir/lib/Analysis/DataFlow/ConstantPropagationAnalysis.cpp (-1)
  • (modified) mlir/lib/Analysis/DataFlow/DeadCodeAnalysis.cpp (-1)
  • (modified) mlir/lib/Analysis/DataFlow/DenseAnalysis.cpp (-1)
  • (modified) mlir/lib/Analysis/DataFlow/SparseAnalysis.cpp (-1)
  • (modified) mlir/lib/Analysis/DataFlowFramework.cpp (-1)
  • (modified) mlir/lib/Analysis/FlatLinearValueConstraints.cpp (-1)
  • (modified) mlir/lib/AsmParser/AffineParser.cpp (-1)
  • (modified) mlir/lib/AsmParser/AsmParserState.cpp (-1)
  • (modified) mlir/lib/AsmParser/DialectSymbolParser.cpp (-1)
  • (modified) mlir/lib/AsmParser/LocationParser.cpp (-1)
  • (modified) mlir/lib/AsmParser/Parser.cpp (-1)
  • (modified) mlir/lib/AsmParser/TypeParser.cpp (-1)
  • (modified) mlir/lib/Bytecode/Reader/BytecodeReader.cpp (-1)
  • (modified) mlir/lib/Bytecode/Writer/BytecodeWriter.cpp (-1)
  • (modified) mlir/lib/CAPI/IR/BuiltinTypes.cpp (-1)
  • (modified) mlir/lib/Conversion/ArithToAMDGPU/ArithToAMDGPU.cpp (-1)
  • (modified) mlir/lib/Conversion/ArithToEmitC/ArithToEmitC.cpp (-1)
  • (modified) mlir/lib/Conversion/BufferizationToMemRef/BufferizationToMemRef.cpp (-1)
  • (modified) mlir/lib/Conversion/ControlFlowToSPIRV/ControlFlowToSPIRV.cpp (-1)
  • (modified) mlir/lib/Conversion/FuncToLLVM/FuncToLLVM.cpp (-1)
  • (modified) mlir/lib/Conversion/FuncToSPIRV/FuncToSPIRV.cpp (-1)
  • (modified) mlir/lib/Conversion/GPUToSPIRV/GPUToSPIRV.cpp (-1)
  • (modified) mlir/lib/Conversion/MemRefToSPIRV/MemRefToSPIRV.cpp (-1)
  • (modified) mlir/lib/Conversion/NVVMToLLVM/NVVMToLLVM.cpp (-1)
  • (modified) mlir/lib/Conversion/SPIRVToLLVM/SPIRVToLLVM.cpp (-1)
  • (modified) mlir/lib/Conversion/TensorToLinalg/TensorToLinalg.cpp (-1)
  • (modified) mlir/lib/Conversion/TensorToSPIRV/TensorToSPIRV.cpp (-1)
  • (modified) mlir/lib/Conversion/VectorToGPU/VectorToGPU.cpp (-1)
  • (modified) mlir/lib/Conversion/VectorToSPIRV/VectorToSPIRV.cpp (-1)
  • (modified) mlir/lib/Dialect/Affine/Transforms/AffineScalarReplacement.cpp (-1)
  • (modified) mlir/lib/Dialect/Arith/IR/ArithOps.cpp (-1)
  • (modified) mlir/lib/Dialect/Arith/Transforms/EmulateNarrowType.cpp (-1)
  • (modified) mlir/lib/Dialect/Arith/Transforms/EmulateWideInt.cpp (-1)
  • (modified) mlir/lib/Dialect/Arith/Transforms/IntNarrowing.cpp (-1)
  • (modified) mlir/lib/Dialect/ArmNeon/Transforms/LowerContractionToSMMLAPattern.cpp (-1)
  • (modified) mlir/lib/Dialect/Bufferization/Transforms/LowerDeallocations.cpp (-1)
  • (modified) mlir/lib/Dialect/GPU/IR/GPUDialect.cpp (-1)
  • (modified) mlir/lib/Dialect/GPU/Transforms/SubgroupReduceLowering.cpp (-1)
  • (modified) mlir/lib/Dialect/IRDL/IR/IRDL.cpp (-1)
  • (modified) mlir/lib/Dialect/IRDL/IRDLLoading.cpp (-1)
  • (modified) mlir/lib/Dialect/IRDL/IRDLVerifiers.cpp (-1)
  • (modified) mlir/lib/Dialect/LLVMIR/IR/BasicPtxBuilderInterface.cpp (-1)
  • (modified) mlir/lib/Dialect/LLVMIR/IR/NVVMDialect.cpp (-1)
  • (modified) mlir/lib/Dialect/Linalg/Transforms/MeshShardingInterfaceImpl.cpp (-1)
  • (modified) mlir/lib/Dialect/Linalg/Transforms/TransposeConv2D.cpp (-1)
  • (modified) mlir/lib/Dialect/MemRef/IR/MemRefMemorySlot.cpp (-1)
  • (modified) mlir/lib/Dialect/MemRef/Transforms/EmulateNarrowType.cpp (-1)
  • (modified) mlir/lib/Dialect/Mesh/IR/MeshOps.cpp (-1)
  • (modified) mlir/lib/Dialect/Mesh/Interfaces/ShardingInterface.cpp (-1)
  • (modified) mlir/lib/Dialect/Mesh/Transforms/ShardingPropagation.cpp (-1)
  • (modified) mlir/lib/Dialect/Mesh/Transforms/Simplifications.cpp (-1)
  • (modified) mlir/lib/Dialect/Mesh/Transforms/Spmdization.cpp (-1)
  • (modified) mlir/lib/Dialect/NVGPU/Transforms/MmaSyncTF32Transform.cpp (-1)
  • (modified) mlir/lib/Dialect/NVGPU/Transforms/OptimizeSharedMemory.cpp (+1-2)
  • (modified) mlir/lib/Dialect/OpenMP/IR/OpenMPDialect.cpp (-1)
  • (modified) mlir/lib/Dialect/Polynomial/IR/Polynomial.cpp (-1)
  • (modified) mlir/lib/Dialect/Polynomial/IR/PolynomialAttributes.cpp (-1)
  • (modified) mlir/lib/Dialect/Polynomial/IR/PolynomialDialect.cpp (-1)
  • (modified) mlir/lib/Dialect/Polynomial/IR/PolynomialOps.cpp (-1)
  • (modified) mlir/lib/Dialect/Quant/IR/QuantDialectBytecode.cpp (-1)
  • (modified) mlir/lib/Dialect/SPIRV/IR/SPIRVOps.cpp (-1)
  • (modified) mlir/lib/Dialect/SPIRV/Transforms/SPIRVWebGPUTransforms.cpp (-1)
  • (modified) mlir/lib/Dialect/Tosa/IR/TosaOps.cpp (+1-1)
  • (modified) mlir/lib/Dialect/Tosa/Transforms/TosaFolders.cpp (-1)
  • (modified) mlir/lib/Dialect/Transform/Interfaces/TransformInterfaces.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorBitCast.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorBroadcast.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorContract.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorGather.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorInterleave.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorScan.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorShapeCast.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/LowerVectorTranspose.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/VectorLinearize.cpp (-1)
  • (modified) mlir/lib/Dialect/Vector/Transforms/VectorTransforms.cpp (-1)
  • (modified) mlir/lib/IR/AffineMap.cpp (-1)
  • (modified) mlir/lib/IR/ExtensibleDialect.cpp (-1)
  • (modified) mlir/lib/Query/Query.cpp (+5-11)
  • (modified) mlir/lib/Support/ToolUtilities.cpp (-1)
  • (modified) mlir/lib/TableGen/CodeGenHelpers.cpp (+6-6)
  • (modified) mlir/lib/Target/LLVMIR/Dialect/GPU/SelectObjectAttr.cpp (+2-2)
  • (modified) mlir/lib/Target/LLVMIR/Dialect/NVVM/NVVMToLLVMIRTranslation.cpp (-1)
  • (modified) mlir/lib/Target/LLVMIR/Dialect/OpenMP/OpenMPToLLVMIRTranslation.cpp (-1)
  • (modified) mlir/lib/Target/LLVMIR/ModuleTranslation.cpp (-1)
  • (modified) mlir/lib/Target/SPIRV/Deserialization/Deserializer.cpp (-1)
  • (modified) mlir/lib/Target/SPIRV/Serialization/SerializeOps.cpp (-1)
  • (modified) mlir/lib/Target/SPIRV/Serialization/Serializer.cpp (-1)
  • (modified) mlir/lib/Tools/PDLL/CodeGen/CPPGen.cpp (+1-1)
  • (modified) mlir/lib/Tools/PDLL/Parser/Lexer.cpp (-1)
  • (modified) mlir/lib/Tools/PDLL/Parser/Lexer.h (-2)
  • (modified) mlir/lib/Tools/PDLL/Parser/Parser.cpp (-1)
  • (modified) mlir/lib/Tools/lsp-server-support/Protocol.cpp (-1)
  • (modified) mlir/lib/Tools/mlir-lsp-server/LSPServer.h (+5-2)
  • (modified) mlir/lib/Tools/mlir-opt/MlirOptMain.cpp (-1)
  • (modified) mlir/lib/Tools/mlir-pdll-lsp-server/LSPServer.h (+5-2)
  • (modified) mlir/lib/Tools/mlir-pdll-lsp-server/PDLLServer.h (+2-1)
  • (modified) mlir/lib/Tools/mlir-query/MlirQueryMain.cpp (+1-2)
  • (modified) mlir/lib/Tools/mlir-reduce/MlirReduceMain.cpp (-1)
  • (modified) mlir/lib/Tools/mlir-translate/MlirTranslateMain.cpp (-1)
  • (modified) mlir/lib/Tools/tblgen-lsp-server/LSPServer.h (+5-3)
  • (modified) mlir/lib/Tools/tblgen-lsp-server/TableGenServer.cpp (-4)
  • (modified) mlir/lib/Tools/tblgen-lsp-server/TableGenServer.h (+2-1)
  • (modified) mlir/test/lib/Analysis/DataFlow/TestLivenessAnalysis.cpp (-1)
  • (modified) mlir/test/lib/Dialect/ArmNeon/TestLowerToArmNeon.cpp (-1)
  • (modified) mlir/test/lib/Dialect/Mesh/TestOpLowering.cpp (-1)
  • (modified) mlir/test/lib/Dialect/Mesh/TestReshardingSpmdization.cpp (-1)
  • (modified) mlir/test/lib/Dialect/Test/TestAttributes.cpp (-1)
  • (modified) mlir/test/lib/Dialect/Test/TestDialect.cpp (-1)
  • (modified) mlir/test/lib/Dialect/Test/TestOpDefs.cpp (+1-1)
  • (modified) mlir/test/lib/Dialect/Test/TestOps.h (+5-5)
  • (modified) mlir/test/lib/Dialect/Test/TestOps.td (+6-6)
  • (modified) mlir/test/lib/Dialect/Test/TestOpsSyntax.cpp (+1-1)
  • (modified) mlir/test/lib/Dialect/Test/TestOpsSyntax.td (+4-4)
  • (modified) mlir/test/lib/Dialect/Test/TestTypeDefs.td (+1-1)
  • (modified) mlir/test/lib/Dialect/Test/TestTypes.h (+2-2)
  • (modified) mlir/test/mlir-pdll/CodeGen/CPP/general.pdll (+1-1)
  • (modified) mlir/test/mlir-tblgen/attrdefs.td (+1-1)
  • (modified) mlir/test/mlir-tblgen/constraint-unique.td (+9-9)
  • (modified) mlir/test/mlir-tblgen/interfaces-as-constraints.td (+4-4)
  • (modified) mlir/test/mlir-tblgen/op-attribute.td (+2-2)
  • (modified) mlir/test/mlir-tblgen/op-decl-and-defs.td (+5-5)
  • (modified) mlir/test/mlir-tblgen/predicate.td (+3-3)
  • (modified) mlir/test/mlir-tblgen/rewriter-static-matcher.td (+3-3)
  • (modified) mlir/test/mlir-tblgen/typedefs.td (+1-1)
  • (modified) mlir/test/python/python_test_ops.td (+3-3)
  • (modified) mlir/tools/mlir-pdll-lsp-server/mlir-pdll-lsp-server.cpp (+1-1)
diff --git a/flang/include/flang/Optimizer/CodeGen/FIROpPatterns.h b/flang/include/flang/Optimizer/CodeGen/FIROpPatterns.h
index ac095664f6188..91b2025176770 100644
--- a/flang/include/flang/Optimizer/CodeGen/FIROpPatterns.h
+++ b/flang/include/flang/Optimizer/CodeGen/FIROpPatterns.h
@@ -205,10 +205,10 @@ class FIROpConversion : public ConvertFIRToLLVMPattern {
     rewrite(mlir::cast<SourceOp>(op),
             OpAdaptor(operands, mlir::cast<SourceOp>(op)), rewriter);
   }
-  mlir::LogicalResult match(mlir::Operation *op) const final {
+  llvm::LogicalResult match(mlir::Operation *op) const final {
     return match(mlir::cast<SourceOp>(op));
   }
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(mlir::Operation *op, mlir::ArrayRef<mlir::Value> operands,
                   mlir::ConversionPatternRewriter &rewriter) const final {
     return matchAndRewrite(mlir::cast<SourceOp>(op),
@@ -218,14 +218,14 @@ class FIROpConversion : public ConvertFIRToLLVMPattern {
 
   /// Rewrite and Match methods that operate on the SourceOp type. These must be
   /// overridden by the derived pattern class.
-  virtual mlir::LogicalResult match(SourceOp op) const {
+  virtual llvm::LogicalResult match(SourceOp op) const {
     llvm_unreachable("must override match or matchAndRewrite");
   }
   virtual void rewrite(SourceOp op, OpAdaptor adaptor,
                        mlir::ConversionPatternRewriter &rewriter) const {
     llvm_unreachable("must override rewrite or matchAndRewrite");
   }
-  virtual mlir::LogicalResult
+  virtual llvm::LogicalResult
   matchAndRewrite(SourceOp op, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const {
     if (mlir::failed(match(op)))
@@ -246,14 +246,14 @@ class FIROpAndTypeConversion : public FIROpConversion<FromOp> {
   using FIROpConversion<FromOp>::FIROpConversion;
   using OpAdaptor = typename FromOp::Adaptor;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(FromOp op, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const final {
     mlir::Type ty = this->convertType(op.getType());
     return doRewrite(op, ty, adaptor, rewriter);
   }
 
-  virtual mlir::LogicalResult
+  virtual llvm::LogicalResult
   doRewrite(FromOp addr, mlir::Type ty, OpAdaptor adaptor,
             mlir::ConversionPatternRewriter &rewriter) const = 0;
 };
diff --git a/flang/include/flang/Optimizer/CodeGen/TypeConverter.h b/flang/include/flang/Optimizer/CodeGen/TypeConverter.h
index 58803a5cc4044..ece3e4e073f68 100644
--- a/flang/include/flang/Optimizer/CodeGen/TypeConverter.h
+++ b/flang/include/flang/Optimizer/CodeGen/TypeConverter.h
@@ -60,7 +60,7 @@ class LLVMTypeConverter : public mlir::LLVMTypeConverter {
   mlir::Type indexType() const;
 
   // fir.type<name(p : TY'...){f : TY...}>  -->  llvm<"%name = { ty... }">
-  std::optional<mlir::LogicalResult>
+  std::optional<llvm::LogicalResult>
   convertRecordType(fir::RecordType derived,
                     llvm::SmallVectorImpl<mlir::Type> &results);
 
diff --git a/flang/include/flang/Optimizer/Dialect/FirAliasTagOpInterface.h b/flang/include/flang/Optimizer/Dialect/FirAliasTagOpInterface.h
index f2d5b39acf3a7..1e3728e735145 100644
--- a/flang/include/flang/Optimizer/Dialect/FirAliasTagOpInterface.h
+++ b/flang/include/flang/Optimizer/Dialect/FirAliasTagOpInterface.h
@@ -16,10 +16,10 @@
 
 #include "mlir/IR/OpDefinition.h"
 #include "mlir/IR/Operation.h"
-#include "mlir/Support/LogicalResult.h"
+#include "llvm/Support/LogicalResult.h"
 
 namespace fir::detail {
-mlir::LogicalResult verifyFirAliasTagOpInterface(mlir::Operation *op);
+llvm::LogicalResult verifyFirAliasTagOpInterface(mlir::Operation *op);
 } // namespace fir::detail
 
 #include "flang/Optimizer/Dialect/FirAliasTagOpInterface.h.inc"
diff --git a/flang/include/flang/Optimizer/Dialect/FortranVariableInterface.td b/flang/include/flang/Optimizer/Dialect/FortranVariableInterface.td
index 3f78a93a2515e..926e00ca04340 100644
--- a/flang/include/flang/Optimizer/Dialect/FortranVariableInterface.td
+++ b/flang/include/flang/Optimizer/Dialect/FortranVariableInterface.td
@@ -192,7 +192,7 @@ def fir_FortranVariableOpInterface : OpInterface<"FortranVariableOpInterface"> {
     }
 
     /// Interface verifier imlementation for declare operations.
-    mlir::LogicalResult verifyDeclareLikeOpImpl(mlir::Value memRef);
+    llvm::LogicalResult verifyDeclareLikeOpImpl(mlir::Value memRef);
 
   }];
 
diff --git a/flang/include/flang/Optimizer/Dialect/Support/KindMapping.h b/flang/include/flang/Optimizer/Dialect/Support/KindMapping.h
index 138123b7b48ba..083526fcbac94 100644
--- a/flang/include/flang/Optimizer/Dialect/Support/KindMapping.h
+++ b/flang/include/flang/Optimizer/Dialect/Support/KindMapping.h
@@ -124,7 +124,7 @@ class KindMapping {
 private:
   MatchResult badMapString(const llvm::Twine &ptr);
   MatchResult parse(llvm::StringRef kindMap);
-  mlir::LogicalResult setDefaultKinds(llvm::ArrayRef<KindTy> defs);
+  llvm::LogicalResult setDefaultKinds(llvm::ArrayRef<KindTy> defs);
 
   mlir::MLIRContext *context;
   llvm::DenseMap<std::pair<char, KindTy>, Bitsize> intMap;
diff --git a/flang/include/flang/Optimizer/HLFIR/HLFIROps.td b/flang/include/flang/Optimizer/HLFIR/HLFIROps.td
index e9915e899c2c9..fdf0db9d3c75d 100644
--- a/flang/include/flang/Optimizer/HLFIR/HLFIROps.td
+++ b/flang/include/flang/Optimizer/HLFIR/HLFIROps.td
@@ -733,7 +733,7 @@ def hlfir_AssociateOp : hlfir_Op<"associate", [AttrSizedOperandSegments,
       CArg<"mlir::Value", "{}">:$shape, CArg<"mlir::ValueRange", "{}">:$typeparams,
       CArg<"fir::FortranVariableFlagsAttr", "{}">:$fortran_attrs)>,
     OpBuilder<(ins "mlir::Value":$memref, CArg<"mlir::Value", "{}">:$shape,
-      CArg<"mlir::ValueRange", "{}">:$typeparams, 
+      CArg<"mlir::ValueRange", "{}">:$typeparams,
       CArg<"fir::FortranVariableFlagsAttr", "{}">:$fortran_attrs,
       CArg<"llvm::ArrayRef<mlir::NamedAttribute>", "{}">:$attributes)>];
 
@@ -1258,7 +1258,7 @@ def hlfir_OrderedAssignmentTreeOpInterface : OpInterface<"OrderedAssignmentTreeO
 
   let extraClassDeclaration = [{
     /// Interface verifier imlementation.
-    mlir::LogicalResult verifyImpl();
+    llvm::LogicalResult verifyImpl();
 
     mlir::Block* getSubTreeBlock() {
       mlir::Region* region = getSubTreeRegion();
@@ -1733,8 +1733,8 @@ def hlfir_CharExtremumOp : hlfir_Op<"char_extremum",
     [DeclareOpInterfaceMethods<MemoryEffectsOpInterface>]> {
   let summary = "Find max/min from given character strings";
   let description = [{
-    Find the lexicographical minimum or maximum of two or more character 
-    strings of the same character kind and return the string with the lexicographical 
+    Find the lexicographical minimum or maximum of two or more character
+    strings of the same character kind and return the string with the lexicographical
     minimum or maximum number of characters. Example:
 
     %0 = hlfir.char_extremum min, %arg0, %arg1 : (!fir.ref<!fir.char<1,10>>, !fir.ref<!fir.char<1,20>>) -> !hlfir.expr<!fir.char<1,10>>
diff --git a/flang/lib/Optimizer/CodeGen/CodeGen.cpp b/flang/lib/Optimizer/CodeGen/CodeGen.cpp
index 5f35825783c51..7483acfcd1ca7 100644
--- a/flang/lib/Optimizer/CodeGen/CodeGen.cpp
+++ b/flang/lib/Optimizer/CodeGen/CodeGen.cpp
@@ -113,7 +113,7 @@ namespace {
 struct AddrOfOpConversion : public fir::FIROpConversion<fir::AddrOfOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::AddrOfOp addr, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     auto ty = convertType(addr.getType());
@@ -174,7 +174,7 @@ namespace {
 struct DeclareOpConversion : public fir::FIROpConversion<fir::cg::XDeclareOp> {
 public:
   using FIROpConversion::FIROpConversion;
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::cg::XDeclareOp declareOp, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     auto memRef = adaptor.getOperands()[0];
@@ -197,7 +197,7 @@ namespace {
 struct AllocaOpConversion : public fir::FIROpConversion<fir::AllocaOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::AllocaOp alloc, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::ValueRange operands = adaptor.getOperands();
@@ -294,7 +294,7 @@ namespace {
 struct BoxAddrOpConversion : public fir::FIROpConversion<fir::BoxAddrOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxAddrOp boxaddr, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value a = adaptor.getOperands()[0];
@@ -316,7 +316,7 @@ struct BoxAddrOpConversion : public fir::FIROpConversion<fir::BoxAddrOp> {
 struct BoxCharLenOpConversion : public fir::FIROpConversion<fir::BoxCharLenOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxCharLenOp boxCharLen, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value boxChar = adaptor.getOperands()[0];
@@ -339,7 +339,7 @@ struct BoxCharLenOpConversion : public fir::FIROpConversion<fir::BoxCharLenOp> {
 struct BoxDimsOpConversion : public fir::FIROpConversion<fir::BoxDimsOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxDimsOp boxdims, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     llvm::SmallVector<mlir::Type, 3> resultTypes = {
@@ -361,7 +361,7 @@ struct BoxDimsOpConversion : public fir::FIROpConversion<fir::BoxDimsOp> {
 struct BoxEleSizeOpConversion : public fir::FIROpConversion<fir::BoxEleSizeOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxEleSizeOp boxelesz, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value box = adaptor.getOperands()[0];
@@ -379,7 +379,7 @@ struct BoxEleSizeOpConversion : public fir::FIROpConversion<fir::BoxEleSizeOp> {
 struct BoxIsAllocOpConversion : public fir::FIROpConversion<fir::BoxIsAllocOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxIsAllocOp boxisalloc, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value box = adaptor.getOperands()[0];
@@ -397,7 +397,7 @@ struct BoxIsAllocOpConversion : public fir::FIROpConversion<fir::BoxIsAllocOp> {
 struct BoxIsArrayOpConversion : public fir::FIROpConversion<fir::BoxIsArrayOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxIsArrayOp boxisarray, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value a = adaptor.getOperands()[0];
@@ -416,7 +416,7 @@ struct BoxIsArrayOpConversion : public fir::FIROpConversion<fir::BoxIsArrayOp> {
 struct BoxIsPtrOpConversion : public fir::FIROpConversion<fir::BoxIsPtrOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxIsPtrOp boxisptr, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value box = adaptor.getOperands()[0];
@@ -434,7 +434,7 @@ struct BoxIsPtrOpConversion : public fir::FIROpConversion<fir::BoxIsPtrOp> {
 struct BoxRankOpConversion : public fir::FIROpConversion<fir::BoxRankOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxRankOp boxrank, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value a = adaptor.getOperands()[0];
@@ -456,7 +456,7 @@ struct BoxProcHostOpConversion
     : public fir::FIROpConversion<fir::BoxProcHostOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxProcHostOp boxprochost, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     TODO(boxprochost.getLoc(), "fir.boxproc_host codegen");
@@ -470,7 +470,7 @@ struct BoxTypeDescOpConversion
     : public fir::FIROpConversion<fir::BoxTypeDescOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxTypeDescOp boxtypedesc, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value box = adaptor.getOperands()[0];
@@ -488,7 +488,7 @@ struct BoxTypeCodeOpConversion
     : public fir::FIROpConversion<fir::BoxTypeCodeOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::BoxTypeCodeOp op, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Value box = adaptor.getOperands()[0];
@@ -506,7 +506,7 @@ struct BoxTypeCodeOpConversion
 struct StringLitOpConversion : public fir::FIROpConversion<fir::StringLitOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::StringLitOp constop, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     auto ty = convertType(constop.getType());
@@ -547,7 +547,7 @@ struct StringLitOpConversion : public fir::FIROpConversion<fir::StringLitOp> {
 struct CallOpConversion : public fir::FIROpConversion<fir::CallOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::CallOp call, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     llvm::SmallVector<mlir::Type> resultTys;
@@ -578,7 +578,7 @@ namespace {
 struct CmpcOpConversion : public fir::FIROpConversion<fir::CmpcOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::CmpcOp cmp, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::ValueRange operands = adaptor.getOperands();
@@ -616,7 +616,7 @@ struct CmpcOpConversion : public fir::FIROpConversion<fir::CmpcOp> {
 struct ConstcOpConversion : public fir::FIROpConversion<fir::ConstcOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::ConstcOp conc, OpAdaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Location loc = conc.getLoc();
@@ -647,7 +647,7 @@ struct ConvertOpConversion : public fir::FIROpConversion<fir::ConvertOp> {
     return mlir::isa<mlir::FloatType>(ty);
   }
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::ConvertOp convert, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     auto fromFirTy = convert.getValue().getType();
@@ -814,7 +814,7 @@ struct ConvertOpConversion : public fir::FIROpConversion<fir::ConvertOp> {
 struct TypeInfoOpConversion : public fir::FIROpConversion<fir::TypeInfoOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::TypeInfoOp op, OpAdaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     rewriter.eraseOp(op);
@@ -827,7 +827,7 @@ struct TypeInfoOpConversion : public fir::FIROpConversion<fir::TypeInfoOp> {
 struct DTEntryOpConversion : public fir::FIROpConversion<fir::DTEntryOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::DTEntryOp op, OpAdaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     rewriter.eraseOp(op);
@@ -839,7 +839,7 @@ struct DTEntryOpConversion : public fir::FIROpConversion<fir::DTEntryOp> {
 struct GlobalLenOpConversion : public fir::FIROpConversion<fir::GlobalLenOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::GlobalLenOp globalLen, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     TODO(globalLen.getLoc(), "fir.global_len codegen");
@@ -853,7 +853,7 @@ struct LenParamIndexOpConversion
   using FIROpConversion::FIROpConversion;
 
   // FIXME: this should be specialized by the runtime target
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::LenParamIndexOp lenp, OpAdaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     TODO(lenp.getLoc(), "fir.len_param_index codegen");
@@ -867,7 +867,7 @@ struct LenParamIndexOpConversion
 struct EmboxCharOpConversion : public fir::FIROpConversion<fir::EmboxCharOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::EmboxCharOp emboxChar, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::ValueRange operands = adaptor.getOperands();
@@ -960,7 +960,7 @@ namespace {
 struct AllocMemOpConversion : public fir::FIROpConversion<fir::AllocMemOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::AllocMemOp heap, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Type heapTy = heap.getType();
@@ -1030,7 +1030,7 @@ namespace {
 struct FreeMemOpConversion : public fir::FIROpConversion<fir::FreeMemOp> {
   using FIROpConversion::FIROpConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::FreeMemOp freemem, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Location loc = freemem.getLoc();
@@ -1481,7 +1481,7 @@ computeTripletExtent(mlir::ConversionPatternRewriter &rewriter,
 struct EmboxOpConversion : public EmboxCommonConversion<fir::EmboxOp> {
   using EmboxCommonConversion::EmboxCommonConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::EmboxOp embox, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::ValueRange operands = adaptor.getOperands();
@@ -1513,7 +1513,7 @@ struct EmboxOpConversion : public EmboxCommonConversion<fir::EmboxOp> {
 struct XEmboxOpConversion : public EmboxCommonConversion<fir::cg::XEmboxOp> {
   using EmboxCommonConversion::EmboxCommonConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::cg::XEmboxOp xbox, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::ValueRange operands = adaptor.getOperands();
@@ -1711,7 +1711,7 @@ struct XEmboxOpConversion : public EmboxCommonConversion<fir::cg::XEmboxOp> {
 struct XReboxOpConversion : public EmboxCommonConversion<fir::cg::XReboxOp> {
   using EmboxCommonConversion::EmboxCommonConversion;
 
-  mlir::LogicalResult
+  llvm::LogicalResult
   matchAndRewrite(fir::cg::XReboxOp rebox, OpAdaptor adaptor,
                   mlir::ConversionPatternRewriter &rewriter) const override {
     mlir::Location loc = rebox.getLoc();
@@ -1794,7 +1794,7 @@ struct XReboxOpConversion : public EmboxCommonConversion<fir::cg::XReboxOp> {
 private:
   /// Write resulting shape and base address in descriptor, and replace rebox
   /// op.
-  mlir::LogicalResult
+  llvm::LogicalResult
   finalizeRebox(fir::cg::XReboxOp rebox, mlir::Type destBoxTy, mlir::Value dest,
                 mlir::Value base, mlir::ValueRange lbounds,
                 mlir::ValueRange extents, mlir::ValueRange strides,
@@ -1825,7 +1825,7 @@ struct XReboxOpConversion : public EmboxCommonConversion<fir::cg::XReboxOp> {
   }
 
   // Apply slice given the base address, extents and strides of the input box.
-  mlir::LogicalResult
+  llvm::LogicalResult
   sliceBox(fir::cg::XReboxOp rebox, mlir::Type destBoxTy, mlir::Value dest,
            mlir::Value base, mlir::ValueRange inputExtents,
    ...
[truncated]

Copy link
Collaborator

@joker-eph joker-eph left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we keep the MLIR header and just define the using llvm::LogicalResult; there in the meantime? It'll avoid breaking the world downstream for now.

@artagnon
Copy link
Contributor Author

artagnon commented Jul 1, 2024

Hi @joker-eph, could you kindly check that the stop-gap stub is what you meant?

Copy link
Collaborator

@joker-eph joker-eph left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LG!
Probably worth getting another approval, maybe @clementval can look at how it looks for customers from the Flang side?

Copy link
Member

@Moxinilian Moxinilian left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me with respects to IRDL, Mem2Reg and SROA, beyond the nit below.

@artagnon artagnon merged commit db791b2 into llvm:main Jul 2, 2024
4 of 6 checks passed
@artagnon artagnon deleted the logicalresult-llvm branch July 2, 2024 09:42
@llvm-ci
Copy link
Collaborator

llvm-ci commented Jul 2, 2024

LLVM Buildbot has detected a new failure on builder sanitizer-aarch64-linux running on sanitizer-buildbot8 while building flang,llvm,mlir at step 2 "annotate".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/51/builds/750

Here is the relevant piece of the build log for the reference:

Step 2 (annotate) failure: 'python ../sanitizer_buildbot/sanitizers/zorg/buildbot/builders/sanitizers/buildbot_selector.py' (failure)
...
llvm-lit: /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/lit.common.cfg.py:60: warning: Path reported by clang does not exist: "/b/sanitizer-aarch64-linux/build/build_symbolizer/lib/clang/19/lib/aarch64-unknown-linux-gnu". This path was found by running ['/b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang', '--target=aarch64-unknown-linux-gnu', '-Wthread-safety', '-Wthread-safety-reference', '-Wthread-safety-beta', '-print-runtime-dir'].
llvm-lit: /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/lit.common.cfg.py:60: warning: Path reported by clang does not exist: "/b/sanitizer-aarch64-linux/build/build_symbolizer/lib/clang/19/lib/aarch64-unknown-linux-gnu". This path was found by running ['/b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang', '--target=aarch64-unknown-linux-gnu', '-Wthread-safety', '-Wthread-safety-reference', '-Wthread-safety-beta', '-print-runtime-dir'].
llvm-lit: /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/lit.common.cfg.py:60: warning: Path reported by clang does not exist: "/b/sanitizer-aarch64-linux/build/build_symbolizer/lib/clang/19/lib/aarch64-unknown-linux-gnu". This path was found by running ['/b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang', '--target=aarch64-unknown-linux-gnu', '-Wthread-safety', '-Wthread-safety-reference', '-Wthread-safety-beta', '-print-runtime-dir'].
llvm-lit: /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/lit.common.cfg.py:60: warning: Path reported by clang does not exist: "/b/sanitizer-aarch64-linux/build/build_symbolizer/lib/clang/19/lib/aarch64-unknown-linux-gnu". This path was found by running ['/b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang', '--target=aarch64-unknown-linux-gnu', '-Wthread-safety', '-Wthread-safety-reference', '-Wthread-safety-beta', '-print-runtime-dir'].
llvm-lit: /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/lit.common.cfg.py:60: warning: Path reported by clang does not exist: "/b/sanitizer-aarch64-linux/build/build_symbolizer/lib/clang/19/lib/aarch64-unknown-linux-gnu". This path was found by running ['/b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang', '--target=aarch64-unknown-linux-gnu', '-Wthread-safety', '-Wthread-safety-reference', '-Wthread-safety-beta', '-print-runtime-dir'].
llvm-lit: /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/lit.common.cfg.py:60: warning: Path reported by clang does not exist: "/b/sanitizer-aarch64-linux/build/build_symbolizer/lib/clang/19/lib/aarch64-unknown-linux-gnu". This path was found by running ['/b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang', '--target=aarch64-unknown-linux-gnu', '-Wthread-safety', '-Wthread-safety-reference', '-Wthread-safety-beta', '-print-runtime-dir'].
llvm-lit: /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/lit.common.cfg.py:60: warning: Path reported by clang does not exist: "/b/sanitizer-aarch64-linux/build/build_symbolizer/lib/clang/19/lib/aarch64-unknown-linux-gnu". This path was found by running ['/b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang', '--target=aarch64-unknown-linux-gnu', '-Wthread-safety', '-Wthread-safety-reference', '-Wthread-safety-beta', '-print-runtime-dir'].
llvm-lit: /b/sanitizer-aarch64-linux/build/llvm-project/llvm/utils/lit/lit/main.py:72: note: The test suite configuration requested an individual test timeout of 0 seconds but a timeout of 900 seconds was requested on the command line. Forcing timeout to be 900 seconds.
-- Testing: 5475 tests, 48 workers --
Testing: 
FAIL: libFuzzer-aarch64-default-Linux :: fuzzer-leak.test (1 of 5475)
******************** TEST 'libFuzzer-aarch64-default-Linux :: fuzzer-leak.test' FAILED ********************
Exit Code: 1

Command Output (stderr):
--
RUN: at line 3: /b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang    -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta   --driver-mode=g++ -O2 -gline-tables-only -fsanitize=address,fuzzer -I/b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/lib/fuzzer  -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta  /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer/LeakTest.cpp -o /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-LeakTest
+ /b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta --driver-mode=g++ -O2 -gline-tables-only -fsanitize=address,fuzzer -I/b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/lib/fuzzer -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer/LeakTest.cpp -o /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-LeakTest
RUN: at line 4: /b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang    -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta   --driver-mode=g++ -O2 -gline-tables-only -fsanitize=address,fuzzer -I/b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/lib/fuzzer  -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta  /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer/ThreadedLeakTest.cpp -o /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-ThreadedLeakTest
+ /b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta --driver-mode=g++ -O2 -gline-tables-only -fsanitize=address,fuzzer -I/b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/lib/fuzzer -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer/ThreadedLeakTest.cpp -o /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-ThreadedLeakTest
RUN: at line 5: /b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang    -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta   --driver-mode=g++ -O2 -gline-tables-only -fsanitize=address,fuzzer -I/b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/lib/fuzzer  -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta  /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer/LeakTimeoutTest.cpp -o /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-LeakTimeoutTest
+ /b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta --driver-mode=g++ -O2 -gline-tables-only -fsanitize=address,fuzzer -I/b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/lib/fuzzer -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer/LeakTimeoutTest.cpp -o /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-LeakTimeoutTest
RUN: at line 7: rm -rf /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-corpus && mkdir -p /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-corpus
+ rm -rf /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-corpus
+ mkdir -p /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-corpus
RUN: at line 8: not  /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-LeakTest -runs=100000 -detect_leaks=1 /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-corpus 2>&1 | FileCheck /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer/fuzzer-leak.test --check-prefix=LEAK_DURING
+ FileCheck /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer/fuzzer-leak.test --check-prefix=LEAK_DURING
+ not /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-LeakTest -runs=100000 -detect_leaks=1 /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-corpus
RUN: at line 17: /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-LeakTest -runs=0 /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-corpus
+ /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-LeakTest -runs=0 /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-corpus
INFO: Running with entropic power schedule (0xFF, 100).
INFO: Seed: 2686458430
INFO: Loaded 1 modules   (4 inline 8-bit counters): 4 [0xaaaad2403180, 0xaaaad2403184), 
INFO: Loaded 1 PC tables (4 PCs): 4 [0xaaaad2403188,0xaaaad24031c8), 
INFO:        0 files found in /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-corpus
INFO: -max_len is not provided; libFuzzer will not generate inputs larger than 4096 bytes
INFO: A corpus is not provided, starting from an empty corpus
#2	INITED cov: 2 ft: 3 corp: 1/1b exec/s: 0 rss: 33Mb
#2	DONE   cov: 2 ft: 3 corp: 1/1b lim: 4 exec/s: 0 rss: 33Mb
Done 2 runs in 0 second(s)
RUN: at line 19: not  /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-LeakTest -runs=0 -detect_leaks=1 /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer 2>&1 | FileCheck /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer/fuzzer-leak.test --check-prefix=LEAK_IN_CORPUS
+ not /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-LeakTest -runs=0 -detect_leaks=1 /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer
+ FileCheck /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer/fuzzer-leak.test --check-prefix=LEAK_IN_CORPUS
/b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer/fuzzer-leak.test:21:17: error: LEAK_IN_CORPUS: expected string not found in input
LEAK_IN_CORPUS: INFO: a leak has been found in the initial corpus.
                ^
<stdin>:13:54: note: scanning from here
==532899==ERROR: LeakSanitizer: detected memory leaks
                                                     ^
Step 11 (test compiler-rt symbolizer) failure: test compiler-rt symbolizer (failure)
...
llvm-lit: /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/lit.common.cfg.py:60: warning: Path reported by clang does not exist: "/b/sanitizer-aarch64-linux/build/build_symbolizer/lib/clang/19/lib/aarch64-unknown-linux-gnu". This path was found by running ['/b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang', '--target=aarch64-unknown-linux-gnu', '-Wthread-safety', '-Wthread-safety-reference', '-Wthread-safety-beta', '-print-runtime-dir'].
llvm-lit: /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/lit.common.cfg.py:60: warning: Path reported by clang does not exist: "/b/sanitizer-aarch64-linux/build/build_symbolizer/lib/clang/19/lib/aarch64-unknown-linux-gnu". This path was found by running ['/b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang', '--target=aarch64-unknown-linux-gnu', '-Wthread-safety', '-Wthread-safety-reference', '-Wthread-safety-beta', '-print-runtime-dir'].
llvm-lit: /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/lit.common.cfg.py:60: warning: Path reported by clang does not exist: "/b/sanitizer-aarch64-linux/build/build_symbolizer/lib/clang/19/lib/aarch64-unknown-linux-gnu". This path was found by running ['/b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang', '--target=aarch64-unknown-linux-gnu', '-Wthread-safety', '-Wthread-safety-reference', '-Wthread-safety-beta', '-print-runtime-dir'].
llvm-lit: /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/lit.common.cfg.py:60: warning: Path reported by clang does not exist: "/b/sanitizer-aarch64-linux/build/build_symbolizer/lib/clang/19/lib/aarch64-unknown-linux-gnu". This path was found by running ['/b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang', '--target=aarch64-unknown-linux-gnu', '-Wthread-safety', '-Wthread-safety-reference', '-Wthread-safety-beta', '-print-runtime-dir'].
llvm-lit: /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/lit.common.cfg.py:60: warning: Path reported by clang does not exist: "/b/sanitizer-aarch64-linux/build/build_symbolizer/lib/clang/19/lib/aarch64-unknown-linux-gnu". This path was found by running ['/b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang', '--target=aarch64-unknown-linux-gnu', '-Wthread-safety', '-Wthread-safety-reference', '-Wthread-safety-beta', '-print-runtime-dir'].
llvm-lit: /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/lit.common.cfg.py:60: warning: Path reported by clang does not exist: "/b/sanitizer-aarch64-linux/build/build_symbolizer/lib/clang/19/lib/aarch64-unknown-linux-gnu". This path was found by running ['/b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang', '--target=aarch64-unknown-linux-gnu', '-Wthread-safety', '-Wthread-safety-reference', '-Wthread-safety-beta', '-print-runtime-dir'].
llvm-lit: /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/lit.common.cfg.py:60: warning: Path reported by clang does not exist: "/b/sanitizer-aarch64-linux/build/build_symbolizer/lib/clang/19/lib/aarch64-unknown-linux-gnu". This path was found by running ['/b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang', '--target=aarch64-unknown-linux-gnu', '-Wthread-safety', '-Wthread-safety-reference', '-Wthread-safety-beta', '-print-runtime-dir'].
llvm-lit: /b/sanitizer-aarch64-linux/build/llvm-project/llvm/utils/lit/lit/main.py:72: note: The test suite configuration requested an individual test timeout of 0 seconds but a timeout of 900 seconds was requested on the command line. Forcing timeout to be 900 seconds.
-- Testing: 5475 tests, 48 workers --
Testing: 
FAIL: libFuzzer-aarch64-default-Linux :: fuzzer-leak.test (1 of 5475)
******************** TEST 'libFuzzer-aarch64-default-Linux :: fuzzer-leak.test' FAILED ********************
Exit Code: 1

Command Output (stderr):
--
RUN: at line 3: /b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang    -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta   --driver-mode=g++ -O2 -gline-tables-only -fsanitize=address,fuzzer -I/b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/lib/fuzzer  -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta  /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer/LeakTest.cpp -o /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-LeakTest
+ /b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta --driver-mode=g++ -O2 -gline-tables-only -fsanitize=address,fuzzer -I/b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/lib/fuzzer -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer/LeakTest.cpp -o /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-LeakTest
RUN: at line 4: /b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang    -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta   --driver-mode=g++ -O2 -gline-tables-only -fsanitize=address,fuzzer -I/b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/lib/fuzzer  -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta  /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer/ThreadedLeakTest.cpp -o /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-ThreadedLeakTest
+ /b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta --driver-mode=g++ -O2 -gline-tables-only -fsanitize=address,fuzzer -I/b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/lib/fuzzer -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer/ThreadedLeakTest.cpp -o /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-ThreadedLeakTest
RUN: at line 5: /b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang    -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta   --driver-mode=g++ -O2 -gline-tables-only -fsanitize=address,fuzzer -I/b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/lib/fuzzer  -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta  /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer/LeakTimeoutTest.cpp -o /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-LeakTimeoutTest
+ /b/sanitizer-aarch64-linux/build/build_symbolizer/./bin/clang -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta --driver-mode=g++ -O2 -gline-tables-only -fsanitize=address,fuzzer -I/b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/lib/fuzzer -Wthread-safety -Wthread-safety-reference -Wthread-safety-beta /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer/LeakTimeoutTest.cpp -o /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-LeakTimeoutTest
RUN: at line 7: rm -rf /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-corpus && mkdir -p /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-corpus
+ rm -rf /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-corpus
+ mkdir -p /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-corpus
RUN: at line 8: not  /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-LeakTest -runs=100000 -detect_leaks=1 /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-corpus 2>&1 | FileCheck /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer/fuzzer-leak.test --check-prefix=LEAK_DURING
+ FileCheck /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer/fuzzer-leak.test --check-prefix=LEAK_DURING
+ not /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-LeakTest -runs=100000 -detect_leaks=1 /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-corpus
RUN: at line 17: /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-LeakTest -runs=0 /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-corpus
+ /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-LeakTest -runs=0 /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-corpus
INFO: Running with entropic power schedule (0xFF, 100).
INFO: Seed: 2686458430
INFO: Loaded 1 modules   (4 inline 8-bit counters): 4 [0xaaaad2403180, 0xaaaad2403184), 
INFO: Loaded 1 PC tables (4 PCs): 4 [0xaaaad2403188,0xaaaad24031c8), 
INFO:        0 files found in /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-corpus
INFO: -max_len is not provided; libFuzzer will not generate inputs larger than 4096 bytes
INFO: A corpus is not provided, starting from an empty corpus
#2	INITED cov: 2 ft: 3 corp: 1/1b exec/s: 0 rss: 33Mb
#2	DONE   cov: 2 ft: 3 corp: 1/1b lim: 4 exec/s: 0 rss: 33Mb
Done 2 runs in 0 second(s)
RUN: at line 19: not  /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-LeakTest -runs=0 -detect_leaks=1 /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer 2>&1 | FileCheck /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer/fuzzer-leak.test --check-prefix=LEAK_IN_CORPUS
+ not /b/sanitizer-aarch64-linux/build/build_symbolizer/runtimes/runtimes-bins/compiler-rt/test/fuzzer/AARCH64DefaultLinuxConfig/Output/fuzzer-leak.test.tmp-LeakTest -runs=0 -detect_leaks=1 /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer
+ FileCheck /b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer/fuzzer-leak.test --check-prefix=LEAK_IN_CORPUS
/b/sanitizer-aarch64-linux/build/llvm-project/compiler-rt/test/fuzzer/fuzzer-leak.test:21:17: error: LEAK_IN_CORPUS: expected string not found in input
LEAK_IN_CORPUS: INFO: a leak has been found in the initial corpus.
                ^
<stdin>:13:54: note: scanning from here
==532899==ERROR: LeakSanitizer: detected memory leaks
                                                     ^

lravenclaw pushed a commit to lravenclaw/llvm-project that referenced this pull request Jul 3, 2024
This patch is part of a project to move the Presburger library into
LLVM.
kbluck pushed a commit to kbluck/llvm-project that referenced this pull request Jul 6, 2024
This patch is part of a project to move the Presburger library into
LLVM.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants