From 8c569c362ad94a81d3351ee0896fc854fe2f71f6 Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Sun, 29 Jun 2025 00:31:56 -0700 Subject: [PATCH] [llvm] Remove unused includes (NFC) These are identified by misc-include-cleaner. I've filtered out those that break builds. Also, I'm staying away from llvm-config.h, config.h, and Compiler.h, which likely cause platform- or compiler-specific build failures. --- .../BreakpointManagers/FileLineColLocBreakpointManager.cpp | 2 -- mlir/lib/Debug/ExecutionContext.cpp | 2 -- mlir/lib/Debug/Observers/ActionProfiler.cpp | 2 -- mlir/lib/Interfaces/ControlFlowInterfaces.cpp | 2 -- mlir/lib/Interfaces/LoopLikeInterface.cpp | 1 - mlir/lib/Interfaces/SideEffectInterfaces.cpp | 1 - mlir/lib/Pass/Pass.cpp | 4 ---- mlir/lib/Pass/PassCrashRecovery.cpp | 3 --- mlir/lib/Pass/PassTiming.cpp | 1 - mlir/lib/Query/Matcher/ErrorBuilder.cpp | 1 - mlir/lib/Query/Query.cpp | 1 - mlir/lib/Reducer/ReductionNode.cpp | 1 - mlir/lib/Reducer/ReductionTreePass.cpp | 3 --- mlir/lib/Rewrite/FrozenRewritePatternSet.cpp | 1 - mlir/lib/Support/Timing.cpp | 2 -- mlir/lib/Tools/PDLL/CodeGen/CPPGen.cpp | 2 -- mlir/lib/Tools/PDLL/ODS/Context.cpp | 1 - mlir/lib/Tools/PDLL/ODS/Dialect.cpp | 2 -- mlir/lib/Tools/PDLL/Parser/Parser.cpp | 1 - mlir/lib/Tools/lsp-server-support/Logging.cpp | 1 - mlir/lib/Tools/lsp-server-support/Protocol.cpp | 5 ----- mlir/lib/Tools/lsp-server-support/Transport.cpp | 1 - mlir/lib/Tools/mlir-opt/MlirOptMain.cpp | 7 ------- mlir/lib/Tools/mlir-pdll-lsp-server/LSPServer.cpp | 2 -- mlir/lib/Tools/mlir-pdll-lsp-server/Protocol.cpp | 6 ------ mlir/lib/Tools/mlir-reduce/MlirReduceMain.cpp | 3 --- mlir/lib/Tools/mlir-translate/Translation.cpp | 2 -- mlir/lib/Tools/tblgen-lsp-server/LSPServer.cpp | 2 -- 28 files changed, 62 deletions(-) diff --git a/mlir/lib/Debug/BreakpointManagers/FileLineColLocBreakpointManager.cpp b/mlir/lib/Debug/BreakpointManagers/FileLineColLocBreakpointManager.cpp index 594aa11128611..4ad3e7f22a19a 100644 --- a/mlir/lib/Debug/BreakpointManagers/FileLineColLocBreakpointManager.cpp +++ b/mlir/lib/Debug/BreakpointManagers/FileLineColLocBreakpointManager.cpp @@ -7,8 +7,6 @@ //===----------------------------------------------------------------------===// #include "mlir/Debug/BreakpointManagers/FileLineColLocBreakpointManager.h" -#include "mlir/IR/Diagnostics.h" -#include "llvm/Support/raw_ostream.h" using namespace mlir; using namespace mlir::tracing; diff --git a/mlir/lib/Debug/ExecutionContext.cpp b/mlir/lib/Debug/ExecutionContext.cpp index f7505b6608c81..f311d6d0f44f0 100644 --- a/mlir/lib/Debug/ExecutionContext.cpp +++ b/mlir/lib/Debug/ExecutionContext.cpp @@ -11,8 +11,6 @@ #include "llvm/ADT/ScopeExit.h" #include "llvm/Support/FormatVariadic.h" -#include - using namespace mlir; using namespace mlir::tracing; diff --git a/mlir/lib/Debug/Observers/ActionProfiler.cpp b/mlir/lib/Debug/Observers/ActionProfiler.cpp index a6b7d5e18aa07..88e6ae211a2d4 100644 --- a/mlir/lib/Debug/Observers/ActionProfiler.cpp +++ b/mlir/lib/Debug/Observers/ActionProfiler.cpp @@ -9,8 +9,6 @@ #include "mlir/Debug/Observers/ActionProfiler.h" #include "mlir/Debug/BreakpointManager.h" #include "mlir/IR/Action.h" -#include "mlir/Rewrite/PatternApplicator.h" -#include "llvm/Support/Casting.h" #include "llvm/Support/Threading.h" #include "llvm/Support/raw_ostream.h" #include diff --git a/mlir/lib/Interfaces/ControlFlowInterfaces.cpp b/mlir/lib/Interfaces/ControlFlowInterfaces.cpp index e87bb461b0329..ca3f7666dba8a 100644 --- a/mlir/lib/Interfaces/ControlFlowInterfaces.cpp +++ b/mlir/lib/Interfaces/ControlFlowInterfaces.cpp @@ -9,9 +9,7 @@ #include #include "mlir/IR/BuiltinTypes.h" -#include "mlir/Interfaces/CallInterfaces.h" #include "mlir/Interfaces/ControlFlowInterfaces.h" -#include "llvm/ADT/SmallPtrSet.h" using namespace mlir; diff --git a/mlir/lib/Interfaces/LoopLikeInterface.cpp b/mlir/lib/Interfaces/LoopLikeInterface.cpp index 1e0e87b64e811..d4cef29008c2a 100644 --- a/mlir/lib/Interfaces/LoopLikeInterface.cpp +++ b/mlir/lib/Interfaces/LoopLikeInterface.cpp @@ -9,7 +9,6 @@ #include "mlir/Interfaces/LoopLikeInterface.h" #include "mlir/Interfaces/FunctionInterfaces.h" -#include "llvm/ADT/DenseSet.h" using namespace mlir; diff --git a/mlir/lib/Interfaces/SideEffectInterfaces.cpp b/mlir/lib/Interfaces/SideEffectInterfaces.cpp index 59fd19310cea5..266f6dbacce89 100644 --- a/mlir/lib/Interfaces/SideEffectInterfaces.cpp +++ b/mlir/lib/Interfaces/SideEffectInterfaces.cpp @@ -9,7 +9,6 @@ #include "mlir/Interfaces/SideEffectInterfaces.h" #include "mlir/IR/SymbolTable.h" -#include "llvm/ADT/SmallPtrSet.h" #include using namespace mlir; diff --git a/mlir/lib/Pass/Pass.cpp b/mlir/lib/Pass/Pass.cpp index dafec39fd5eb0..0db9808b722a7 100644 --- a/mlir/lib/Pass/Pass.cpp +++ b/mlir/lib/Pass/Pass.cpp @@ -13,7 +13,6 @@ #include "mlir/Pass/Pass.h" #include "PassDetail.h" #include "mlir/IR/Diagnostics.h" -#include "mlir/IR/Dialect.h" #include "mlir/IR/OpDefinition.h" #include "mlir/IR/Threading.h" #include "mlir/IR/Verifier.h" @@ -22,12 +21,9 @@ #include "llvm/ADT/Hashing.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/ScopeExit.h" -#include "llvm/Support/CommandLine.h" -#include "llvm/Support/CrashRecoveryContext.h" #include "llvm/Support/Mutex.h" #include "llvm/Support/Signals.h" #include "llvm/Support/Threading.h" -#include "llvm/Support/ToolOutputFile.h" #include using namespace mlir; diff --git a/mlir/lib/Pass/PassCrashRecovery.cpp b/mlir/lib/Pass/PassCrashRecovery.cpp index b048ff9462392..08f5114ae6eb2 100644 --- a/mlir/lib/Pass/PassCrashRecovery.cpp +++ b/mlir/lib/Pass/PassCrashRecovery.cpp @@ -8,16 +8,13 @@ #include "PassDetail.h" #include "mlir/IR/Diagnostics.h" -#include "mlir/IR/Dialect.h" #include "mlir/IR/SymbolTable.h" #include "mlir/IR/Verifier.h" #include "mlir/Parser/Parser.h" #include "mlir/Pass/Pass.h" #include "mlir/Support/FileUtilities.h" #include "llvm/ADT/STLExtras.h" -#include "llvm/ADT/ScopeExit.h" #include "llvm/ADT/SetVector.h" -#include "llvm/Support/CommandLine.h" #include "llvm/Support/CrashRecoveryContext.h" #include "llvm/Support/ManagedStatic.h" #include "llvm/Support/Mutex.h" diff --git a/mlir/lib/Pass/PassTiming.cpp b/mlir/lib/Pass/PassTiming.cpp index 45852455aa737..dab56f09a72eb 100644 --- a/mlir/lib/Pass/PassTiming.cpp +++ b/mlir/lib/Pass/PassTiming.cpp @@ -11,7 +11,6 @@ #include "llvm/ADT/SmallVector.h" #include "llvm/Support/Threading.h" -#include #include using namespace mlir; diff --git a/mlir/lib/Query/Matcher/ErrorBuilder.cpp b/mlir/lib/Query/Matcher/ErrorBuilder.cpp index de6447dac490a..b55ae05dbee16 100644 --- a/mlir/lib/Query/Matcher/ErrorBuilder.cpp +++ b/mlir/lib/Query/Matcher/ErrorBuilder.cpp @@ -8,7 +8,6 @@ #include "mlir/Query/Matcher/ErrorBuilder.h" #include "Diagnostics.h" -#include "llvm/ADT/StringRef.h" #include "llvm/ADT/Twine.h" #include diff --git a/mlir/lib/Query/Query.cpp b/mlir/lib/Query/Query.cpp index 637e1f3cdef87..b5a9d2f1d350c 100644 --- a/mlir/lib/Query/Query.cpp +++ b/mlir/lib/Query/Query.cpp @@ -13,7 +13,6 @@ #include "mlir/IR/Verifier.h" #include "mlir/Query/Matcher/MatchFinder.h" #include "mlir/Query/QuerySession.h" -#include "llvm/ADT/SetVector.h" #include "llvm/Support/SourceMgr.h" #include "llvm/Support/raw_ostream.h" diff --git a/mlir/lib/Reducer/ReductionNode.cpp b/mlir/lib/Reducer/ReductionNode.cpp index d57ee932bfcae..11aeaf77b4642 100644 --- a/mlir/lib/Reducer/ReductionNode.cpp +++ b/mlir/lib/Reducer/ReductionNode.cpp @@ -18,7 +18,6 @@ #include "mlir/IR/IRMapping.h" #include "llvm/ADT/STLExtras.h" -#include #include using namespace mlir; diff --git a/mlir/lib/Reducer/ReductionTreePass.cpp b/mlir/lib/Reducer/ReductionTreePass.cpp index 549e4f2bd813b..5b49204013cc0 100644 --- a/mlir/lib/Reducer/ReductionTreePass.cpp +++ b/mlir/lib/Reducer/ReductionTreePass.cpp @@ -15,7 +15,6 @@ //===----------------------------------------------------------------------===// #include "mlir/IR/DialectInterface.h" -#include "mlir/IR/OpDefinition.h" #include "mlir/Reducer/Passes.h" #include "mlir/Reducer/ReductionNode.h" #include "mlir/Reducer/ReductionPatternInterface.h" @@ -24,9 +23,7 @@ #include "mlir/Transforms/GreedyPatternRewriteDriver.h" #include "llvm/ADT/ArrayRef.h" -#include "llvm/ADT/SmallVector.h" #include "llvm/Support/Allocator.h" -#include "llvm/Support/ManagedStatic.h" namespace mlir { #define GEN_PASS_DEF_REDUCTIONTREEPASS diff --git a/mlir/lib/Rewrite/FrozenRewritePatternSet.cpp b/mlir/lib/Rewrite/FrozenRewritePatternSet.cpp index e706d95855435..34f1442ece7e6 100644 --- a/mlir/lib/Rewrite/FrozenRewritePatternSet.cpp +++ b/mlir/lib/Rewrite/FrozenRewritePatternSet.cpp @@ -9,7 +9,6 @@ #include "mlir/Rewrite/FrozenRewritePatternSet.h" #include "ByteCode.h" #include "mlir/Interfaces/SideEffectInterfaces.h" -#include "mlir/Pass/Pass.h" #include "mlir/Pass/PassManager.h" #include diff --git a/mlir/lib/Support/Timing.cpp b/mlir/lib/Support/Timing.cpp index ac16eb7d224c9..fb6f82c283df5 100644 --- a/mlir/lib/Support/Timing.cpp +++ b/mlir/lib/Support/Timing.cpp @@ -19,13 +19,11 @@ #include "llvm/Support/Allocator.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Format.h" -#include "llvm/Support/FormatVariadic.h" #include "llvm/Support/ManagedStatic.h" #include "llvm/Support/RWMutex.h" #include "llvm/Support/Threading.h" #include "llvm/Support/raw_ostream.h" -#include #include #include diff --git a/mlir/lib/Tools/PDLL/CodeGen/CPPGen.cpp b/mlir/lib/Tools/PDLL/CodeGen/CPPGen.cpp index 611b734dc4b05..9670285e767b8 100644 --- a/mlir/lib/Tools/PDLL/CodeGen/CPPGen.cpp +++ b/mlir/lib/Tools/PDLL/CodeGen/CPPGen.cpp @@ -13,12 +13,10 @@ //===----------------------------------------------------------------------===// #include "mlir/Tools/PDLL/CodeGen/CPPGen.h" -#include "mlir/Dialect/PDL/IR/PDL.h" #include "mlir/Dialect/PDL/IR/PDLOps.h" #include "mlir/IR/BuiltinOps.h" #include "mlir/Tools/PDLL/AST/Nodes.h" #include "mlir/Tools/PDLL/ODS/Operation.h" -#include "llvm/ADT/SmallString.h" #include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringSet.h" #include "llvm/ADT/TypeSwitch.h" diff --git a/mlir/lib/Tools/PDLL/ODS/Context.cpp b/mlir/lib/Tools/PDLL/ODS/Context.cpp index 61a9df92c8047..a3933c9c73b20 100644 --- a/mlir/lib/Tools/PDLL/ODS/Context.cpp +++ b/mlir/lib/Tools/PDLL/ODS/Context.cpp @@ -12,7 +12,6 @@ #include "mlir/Tools/PDLL/ODS/Operation.h" #include "llvm/Support/ScopedPrinter.h" #include "llvm/Support/raw_ostream.h" -#include using namespace mlir; using namespace mlir::pdll::ods; diff --git a/mlir/lib/Tools/PDLL/ODS/Dialect.cpp b/mlir/lib/Tools/PDLL/ODS/Dialect.cpp index b4654a6ad5b2e..5e4ea5063b78d 100644 --- a/mlir/lib/Tools/PDLL/ODS/Dialect.cpp +++ b/mlir/lib/Tools/PDLL/ODS/Dialect.cpp @@ -7,9 +7,7 @@ //===----------------------------------------------------------------------===// #include "mlir/Tools/PDLL/ODS/Dialect.h" -#include "mlir/Tools/PDLL/ODS/Constraint.h" #include "mlir/Tools/PDLL/ODS/Operation.h" -#include "llvm/Support/raw_ostream.h" using namespace mlir; using namespace mlir::pdll::ods; diff --git a/mlir/lib/Tools/PDLL/Parser/Parser.cpp b/mlir/lib/Tools/PDLL/Parser/Parser.cpp index 50e10447ee468..51e702a1bb53a 100644 --- a/mlir/lib/Tools/PDLL/Parser/Parser.cpp +++ b/mlir/lib/Tools/PDLL/Parser/Parser.cpp @@ -25,7 +25,6 @@ #include "llvm/ADT/StringExtras.h" #include "llvm/ADT/TypeSwitch.h" #include "llvm/Support/FormatVariadic.h" -#include "llvm/Support/ManagedStatic.h" #include "llvm/Support/SaveAndRestore.h" #include "llvm/Support/ScopedPrinter.h" #include "llvm/TableGen/Error.h" diff --git a/mlir/lib/Tools/lsp-server-support/Logging.cpp b/mlir/lib/Tools/lsp-server-support/Logging.cpp index 6335fbfb5dfb8..373e2165c244d 100644 --- a/mlir/lib/Tools/lsp-server-support/Logging.cpp +++ b/mlir/lib/Tools/lsp-server-support/Logging.cpp @@ -8,7 +8,6 @@ #include "mlir/Tools/lsp-server-support/Logging.h" #include "llvm/Support/Chrono.h" -#include "llvm/Support/ManagedStatic.h" #include "llvm/Support/raw_ostream.h" using namespace mlir; diff --git a/mlir/lib/Tools/lsp-server-support/Protocol.cpp b/mlir/lib/Tools/lsp-server-support/Protocol.cpp index 0054dc37b39cb..33cdd2855eff1 100644 --- a/mlir/lib/Tools/lsp-server-support/Protocol.cpp +++ b/mlir/lib/Tools/lsp-server-support/Protocol.cpp @@ -11,14 +11,9 @@ //===----------------------------------------------------------------------===// #include "mlir/Tools/lsp-server-support/Protocol.h" -#include "mlir/Tools/lsp-server-support/Logging.h" -#include "llvm/ADT/Hashing.h" -#include "llvm/ADT/SmallString.h" #include "llvm/ADT/StringExtras.h" #include "llvm/ADT/StringSet.h" #include "llvm/Support/ErrorHandling.h" -#include "llvm/Support/Format.h" -#include "llvm/Support/FormatVariadic.h" #include "llvm/Support/JSON.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Path.h" diff --git a/mlir/lib/Tools/lsp-server-support/Transport.cpp b/mlir/lib/Tools/lsp-server-support/Transport.cpp index d0863ba0ae087..5a098b2841f4b 100644 --- a/mlir/lib/Tools/lsp-server-support/Transport.cpp +++ b/mlir/lib/Tools/lsp-server-support/Transport.cpp @@ -11,7 +11,6 @@ #include "mlir/Tools/lsp-server-support/Logging.h" #include "mlir/Tools/lsp-server-support/Protocol.h" #include "llvm/ADT/SmallString.h" -#include "llvm/Support/Errno.h" #include "llvm/Support/Error.h" #include #include diff --git a/mlir/lib/Tools/mlir-opt/MlirOptMain.cpp b/mlir/lib/Tools/mlir-opt/MlirOptMain.cpp index 31e0caa768113..8f785900780f5 100644 --- a/mlir/lib/Tools/mlir-opt/MlirOptMain.cpp +++ b/mlir/lib/Tools/mlir-opt/MlirOptMain.cpp @@ -15,20 +15,15 @@ #include "mlir/Bytecode/BytecodeWriter.h" #include "mlir/Debug/CLOptionsSetup.h" #include "mlir/Debug/Counter.h" -#include "mlir/Debug/DebuggerExecutionContextHook.h" -#include "mlir/Debug/ExecutionContext.h" -#include "mlir/Debug/Observers/ActionLogging.h" #include "mlir/Dialect/IRDL/IR/IRDL.h" #include "mlir/Dialect/IRDL/IRDLLoading.h" #include "mlir/IR/AsmState.h" #include "mlir/IR/Attributes.h" #include "mlir/IR/BuiltinOps.h" #include "mlir/IR/Diagnostics.h" -#include "mlir/IR/Dialect.h" #include "mlir/IR/Location.h" #include "mlir/IR/MLIRContext.h" #include "mlir/Parser/Parser.h" -#include "mlir/Pass/Pass.h" #include "mlir/Pass/PassManager.h" #include "mlir/Pass/PassRegistry.h" #include "mlir/Support/FileUtilities.h" @@ -39,14 +34,12 @@ #include "mlir/Tools/Plugins/PassPlugin.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/CommandLine.h" -#include "llvm/Support/FileUtilities.h" #include "llvm/Support/InitLLVM.h" #include "llvm/Support/LogicalResult.h" #include "llvm/Support/ManagedStatic.h" #include "llvm/Support/Process.h" #include "llvm/Support/Regex.h" #include "llvm/Support/SourceMgr.h" -#include "llvm/Support/StringSaver.h" #include "llvm/Support/ThreadPool.h" #include "llvm/Support/ToolOutputFile.h" diff --git a/mlir/lib/Tools/mlir-pdll-lsp-server/LSPServer.cpp b/mlir/lib/Tools/mlir-pdll-lsp-server/LSPServer.cpp index c15f17025e3c1..82542a12a1807 100644 --- a/mlir/lib/Tools/mlir-pdll-lsp-server/LSPServer.cpp +++ b/mlir/lib/Tools/mlir-pdll-lsp-server/LSPServer.cpp @@ -12,8 +12,6 @@ #include "Protocol.h" #include "mlir/Tools/lsp-server-support/Logging.h" #include "mlir/Tools/lsp-server-support/Transport.h" -#include "llvm/ADT/FunctionExtras.h" -#include "llvm/ADT/StringMap.h" #include #define DEBUG_TYPE "pdll-lsp-server" diff --git a/mlir/lib/Tools/mlir-pdll-lsp-server/Protocol.cpp b/mlir/lib/Tools/mlir-pdll-lsp-server/Protocol.cpp index 27a1b712ae801..0c9896e3ec1b4 100644 --- a/mlir/lib/Tools/mlir-pdll-lsp-server/Protocol.cpp +++ b/mlir/lib/Tools/mlir-pdll-lsp-server/Protocol.cpp @@ -11,14 +11,8 @@ //===----------------------------------------------------------------------===// #include "Protocol.h" -#include "llvm/ADT/Hashing.h" -#include "llvm/ADT/SmallString.h" #include "llvm/Support/ErrorHandling.h" -#include "llvm/Support/Format.h" -#include "llvm/Support/FormatVariadic.h" #include "llvm/Support/JSON.h" -#include "llvm/Support/Path.h" -#include "llvm/Support/raw_ostream.h" using namespace mlir; using namespace mlir::lsp; diff --git a/mlir/lib/Tools/mlir-reduce/MlirReduceMain.cpp b/mlir/lib/Tools/mlir-reduce/MlirReduceMain.cpp index a9cde4acf4ff8..e89d392d375e8 100644 --- a/mlir/lib/Tools/mlir-reduce/MlirReduceMain.cpp +++ b/mlir/lib/Tools/mlir-reduce/MlirReduceMain.cpp @@ -14,12 +14,9 @@ //===----------------------------------------------------------------------===// #include "mlir/Tools/mlir-reduce/MlirReduceMain.h" -#include "mlir/IR/PatternMatch.h" #include "mlir/Parser/Parser.h" -#include "mlir/Pass/Pass.h" #include "mlir/Pass/PassManager.h" #include "mlir/Reducer/Passes.h" -#include "mlir/Rewrite/FrozenRewritePatternSet.h" #include "mlir/Support/FileUtilities.h" #include "mlir/Tools/ParseUtilities.h" #include "llvm/Support/InitLLVM.h" diff --git a/mlir/lib/Tools/mlir-translate/Translation.cpp b/mlir/lib/Tools/mlir-translate/Translation.cpp index baacfb413a3fe..61a247034c2db 100644 --- a/mlir/lib/Tools/mlir-translate/Translation.cpp +++ b/mlir/lib/Tools/mlir-translate/Translation.cpp @@ -12,8 +12,6 @@ #include "mlir/Tools/mlir-translate/Translation.h" #include "mlir/IR/AsmState.h" -#include "mlir/IR/BuiltinOps.h" -#include "mlir/IR/Dialect.h" #include "mlir/IR/Verifier.h" #include "mlir/Parser/Parser.h" #include "mlir/Tools/ParseUtilities.h" diff --git a/mlir/lib/Tools/tblgen-lsp-server/LSPServer.cpp b/mlir/lib/Tools/tblgen-lsp-server/LSPServer.cpp index 993eea376bc26..bb3c0a77747aa 100644 --- a/mlir/lib/Tools/tblgen-lsp-server/LSPServer.cpp +++ b/mlir/lib/Tools/tblgen-lsp-server/LSPServer.cpp @@ -12,8 +12,6 @@ #include "mlir/Tools/lsp-server-support/Logging.h" #include "mlir/Tools/lsp-server-support/Protocol.h" #include "mlir/Tools/lsp-server-support/Transport.h" -#include "llvm/ADT/FunctionExtras.h" -#include "llvm/ADT/StringMap.h" #include using namespace mlir;