Author: Alexis Engelke Date: 2025-12-22T15:51:37Z New Revision: 2634a2bda1db92ab5324a47459ee7f23e531ce53
URL: https://github.com/llvm/llvm-project/commit/2634a2bda1db92ab5324a47459ee7f23e531ce53 DIFF: https://github.com/llvm/llvm-project/commit/2634a2bda1db92ab5324a47459ee7f23e531ce53.diff LOG: Revert "[LLVM][NFC] Move PassPlugin from Passes to Extensions lib" and subsequent commit This reverts commit d87b47d3a893b849cfd1ee5309b9fec2b0aec8cd. This reverts commit f7ed3d44a198bfe689a1aa284452e875d5bb8a55. Added: llvm/include/llvm/Passes/PassPlugin.h llvm/lib/Passes/PassPlugin.cpp Modified: clang/include/clang/Frontend/CompilerInstance.h clang/lib/CodeGen/BackendUtil.cpp clang/lib/Frontend/CMakeLists.txt clang/lib/Frontend/CompilerInstance.cpp clang/test/CMakeLists.txt clang/test/lit.cfg.py clang/test/lit.site.cfg.py.in clang/tools/clang-linker-wrapper/CMakeLists.txt clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp flang/lib/Frontend/FrontendActions.cpp llvm/examples/Bye/Bye.cpp llvm/examples/IRTransforms/SimplifyCFG.cpp llvm/lib/Extensions/CMakeLists.txt llvm/lib/Extensions/Extensions.cpp llvm/lib/LTO/LTOBackend.cpp llvm/lib/Passes/CMakeLists.txt llvm/tools/bugpoint/bugpoint.cpp llvm/tools/llc/CMakeLists.txt llvm/tools/llc/llc.cpp llvm/tools/llvm-lto2/CMakeLists.txt llvm/tools/llvm-lto2/llvm-lto2.cpp llvm/tools/opt/NewPMDriver.cpp llvm/tools/opt/optdriver.cpp llvm/unittests/Analysis/CMakeLists.txt llvm/unittests/Analysis/InlineAdvisorPlugin/InlineAdvisorPlugin.cpp llvm/unittests/Analysis/InlineOrderPlugin/InlineOrderPlugin.cpp llvm/unittests/Analysis/PluginInlineAdvisorAnalysisTest.cpp llvm/unittests/Analysis/PluginInlineOrderAnalysisTest.cpp llvm/unittests/Passes/Plugins/CMakeLists.txt llvm/unittests/Passes/Plugins/DoublerPlugin/DoublerPlugin.cpp llvm/unittests/Passes/Plugins/PluginsTest.cpp llvm/unittests/Passes/Plugins/TestPlugin/TestPlugin.cpp polly/lib/CMakeLists.txt polly/lib/Plugin/Polly.cpp polly/lib/Support/RegisterPasses.cpp Removed: clang/test/CodeGen/pass-plugins.c llvm/include/llvm/Extensions/PassPlugin.h llvm/lib/Extensions/PassPlugin.cpp ################################################################################ diff --git a/clang/include/clang/Frontend/CompilerInstance.h b/clang/include/clang/Frontend/CompilerInstance.h index ded5f55d180aa..a8e8461b9b5a9 100644 --- a/clang/include/clang/Frontend/CompilerInstance.h +++ b/clang/include/clang/Frontend/CompilerInstance.h @@ -36,7 +36,6 @@ namespace llvm { class raw_fd_ostream; -class PassPlugin; class Timer; class TimerGroup; } @@ -132,9 +131,6 @@ class CompilerInstance : public ModuleLoader { /// The semantic analysis object. std::unique_ptr<Sema> TheSema; - /// Back-end pass plugins. - std::vector<std::unique_ptr<llvm::PassPlugin>> PassPlugins; - /// The frontend timer group. std::unique_ptr<llvm::TimerGroup> timerGroup; @@ -648,14 +644,6 @@ class CompilerInstance : public ModuleLoader { /// the compiler instance takes ownership of \p Value. void setCodeCompletionConsumer(CodeCompleteConsumer *Value); - /// } - /// @name Back-end Pass Plugins - /// @{ - - llvm::ArrayRef<std::unique_ptr<llvm::PassPlugin>> getPassPlugins() const { - return PassPlugins; - } - /// @} /// @name Frontend timer /// @{ diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp index 94323dacd33d8..cc6405614d025 100644 --- a/clang/lib/CodeGen/BackendUtil.cpp +++ b/clang/lib/CodeGen/BackendUtil.cpp @@ -27,7 +27,6 @@ #include "llvm/Bitcode/BitcodeWriterPass.h" #include "llvm/CodeGen/TargetSubtargetInfo.h" #include "llvm/Config/llvm-config.h" -#include "llvm/Extensions/PassPlugin.h" #include "llvm/Frontend/Driver/CodeGenOptions.h" #include "llvm/IR/DataLayout.h" #include "llvm/IR/DebugInfo.h" @@ -42,6 +41,7 @@ #include "llvm/MC/TargetRegistry.h" #include "llvm/Object/OffloadBinary.h" #include "llvm/Passes/PassBuilder.h" +#include "llvm/Passes/PassPlugin.h" #include "llvm/Passes/StandardInstrumentations.h" #include "llvm/ProfileData/InstrProfCorrelator.h" #include "llvm/Support/BuryPointer.h" @@ -1019,9 +1019,16 @@ void EmitAssemblyHelper::RunOptimizationPipeline( } #endif } - // Register plugin callbacks with PB. - for (const std::unique_ptr<PassPlugin> &Plugin : CI.getPassPlugins()) - Plugin->registerPassBuilderCallbacks(PB); + // Attempt to load pass plugins and register their callbacks with PB. + for (auto &PluginFN : CodeGenOpts.PassPlugins) { + auto PassPlugin = PassPlugin::Load(PluginFN); + if (PassPlugin) { + PassPlugin->registerPassBuilderCallbacks(PB); + } else { + Diags.Report(diag::err_fe_unable_to_load_plugin) + << PluginFN << toString(PassPlugin.takeError()); + } + } for (const auto &PassCallback : CodeGenOpts.PassBuilderCallbacks) PassCallback(PB); #define HANDLE_EXTENSION(Ext) \ diff --git a/clang/lib/Frontend/CMakeLists.txt b/clang/lib/Frontend/CMakeLists.txt index b17ffe08977a0..634f239933605 100644 --- a/clang/lib/Frontend/CMakeLists.txt +++ b/clang/lib/Frontend/CMakeLists.txt @@ -3,7 +3,6 @@ add_subdirectory(Rewrite) set(LLVM_LINK_COMPONENTS BitReader BitstreamReader - Extensions Option ProfileData Support diff --git a/clang/lib/Frontend/CompilerInstance.cpp b/clang/lib/Frontend/CompilerInstance.cpp index 95f59f7626730..5db3c8fa16988 100644 --- a/clang/lib/Frontend/CompilerInstance.cpp +++ b/clang/lib/Frontend/CompilerInstance.cpp @@ -46,7 +46,6 @@ #include "llvm/ADT/ScopeExit.h" #include "llvm/ADT/Statistic.h" #include "llvm/Config/llvm-config.h" -#include "llvm/Extensions/PassPlugin.h" #include "llvm/Support/AdvisoryLock.h" #include "llvm/Support/BuryPointer.h" #include "llvm/Support/CrashRecoveryContext.h" @@ -1077,16 +1076,6 @@ void CompilerInstance::LoadRequestedPlugins() { << Path << Error; } - // Load and store pass plugins for the back-end. - for (const std::string &Path : getCodeGenOpts().PassPlugins) { - if (auto PassPlugin = llvm::PassPlugin::Load(Path)) { - PassPlugins.emplace_back(std::make_unique<llvm::PassPlugin>(*PassPlugin)); - } else { - getDiagnostics().Report(diag::err_fe_unable_to_load_plugin) - << Path << toString(PassPlugin.takeError()); - } - } - // Check if any of the loaded plugins replaces the main AST action for (const FrontendPluginRegistry::entry &Plugin : FrontendPluginRegistry::entries()) { diff --git a/clang/test/CMakeLists.txt b/clang/test/CMakeLists.txt index 3faf3d7d5f2aa..bcb6bd68fafc2 100644 --- a/clang/test/CMakeLists.txt +++ b/clang/test/CMakeLists.txt @@ -13,6 +13,7 @@ llvm_canonicalize_cmake_booleans( CLANG_ENABLE_OBJC_REWRITER CLANG_LINK_CLANG_DYLIB ENABLE_BACKTRACES + LLVM_BUILD_EXAMPLES LLVM_BYE_LINK_INTO_TOOLS LLVM_ENABLE_PLUGINS LLVM_ENABLE_ZLIB @@ -20,7 +21,6 @@ llvm_canonicalize_cmake_booleans( LLVM_ENABLE_PER_TARGET_RUNTIME_DIR LLVM_ENABLE_THREADS LLVM_ENABLE_REVERSE_ITERATION - LLVM_INCLUDE_EXAMPLES LLVM_LINK_LLVM_DYLIB LLVM_WITH_Z3 PPC_LINUX_DEFAULT_IEEELONGDOUBLE @@ -134,12 +134,6 @@ if(CLANG_BUILD_EXAMPLES AND CLANG_PLUGIN_SUPPORT) ) endif () -if(LLVM_INCLUDE_EXAMPLES AND NOT WIN32 AND NOT CYGWIN) - list(APPEND CLANG_TEST_DEPS - Bye - ) -endif() - if(LLVM_INCLUDE_SPIRV_TOOLS_TESTS) list(APPEND CLANG_TEST_DEPS spirv-dis diff --git a/clang/test/CodeGen/pass-plugins.c b/clang/test/CodeGen/pass-plugins.c deleted file mode 100644 index 9a8ca7b49dff4..0000000000000 --- a/clang/test/CodeGen/pass-plugins.c +++ /dev/null @@ -1,10 +0,0 @@ -// RUN: %clang_cc1 -S < %s -fpass-plugin=%llvmshlibdir/Bye%pluginext -O2 2>&1 | FileCheck %s --check-prefix=CHECK-INACTIVE -// RUN: %clang_cc1 -S < %s -fpass-plugin=%llvmshlibdir/Bye%pluginext -O2 -mllvm -wave-goodbye 2>&1 | FileCheck %s --check-prefix=CHECK-ACTIVE -// REQUIRES: plugins, llvm-examples -// UNSUPPORTED: target={{.*windows.*}} -// CHECK-INACTIVE-NOT: Bye -// CHECK-ACTIVE: Bye: f - -int f(int x) { - return x; -} diff --git a/clang/test/lit.cfg.py b/clang/test/lit.cfg.py index a622f5335354a..52b275c095475 100644 --- a/clang/test/lit.cfg.py +++ b/clang/test/lit.cfg.py @@ -126,8 +126,6 @@ if config.clang_examples: config.available_features.add("examples") -if config.llvm_examples: - config.available_features.add("llvm-examples") def have_host_out_of_process_jit_feature_support(): diff --git a/clang/test/lit.site.cfg.py.in b/clang/test/lit.site.cfg.py.in index 3bdff42262164..f50953a93a412 100644 --- a/clang/test/lit.site.cfg.py.in +++ b/clang/test/lit.site.cfg.py.in @@ -28,7 +28,6 @@ config.clang_staticanalyzer_z3 = @LLVM_WITH_Z3@ config.clang_staticanalyzer_z3_mock = @TEST_WITH_Z3_MOCK@ config.clang_enable_cir = @CLANG_ENABLE_CIR@ config.clang_examples = @CLANG_BUILD_EXAMPLES@ -config.llvm_examples = @LLVM_INCLUDE_EXAMPLES@ config.enable_shared = @ENABLE_SHARED@ config.enable_backtrace = @ENABLE_BACKTRACES@ config.enable_threads = @LLVM_ENABLE_THREADS@ diff --git a/clang/tools/clang-linker-wrapper/CMakeLists.txt b/clang/tools/clang-linker-wrapper/CMakeLists.txt index 741ea01feba7a..bf37d8031025e 100644 --- a/clang/tools/clang-linker-wrapper/CMakeLists.txt +++ b/clang/tools/clang-linker-wrapper/CMakeLists.txt @@ -4,7 +4,6 @@ set(LLVM_LINK_COMPONENTS Core BinaryFormat MC - Extensions Target TransformUtils Analysis diff --git a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp index 549251e656ffc..fcb6c591ec5ca 100644 --- a/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp +++ b/clang/tools/clang-linker-wrapper/ClangLinkerWrapper.cpp @@ -20,7 +20,6 @@ #include "llvm/BinaryFormat/Magic.h" #include "llvm/Bitcode/BitcodeWriter.h" #include "llvm/CodeGen/CommandFlags.h" -#include "llvm/Extensions/PassPlugin.h" #include "llvm/Frontend/Offloading/OffloadWrapper.h" #include "llvm/Frontend/Offloading/Utility.h" #include "llvm/IR/Constants.h" @@ -39,6 +38,7 @@ #include "llvm/Option/ArgList.h" #include "llvm/Option/OptTable.h" #include "llvm/Option/Option.h" +#include "llvm/Passes/PassPlugin.h" #include "llvm/Remarks/HotnessThresholdParser.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Errc.h" diff --git a/flang/lib/Frontend/FrontendActions.cpp b/flang/lib/Frontend/FrontendActions.cpp index 1d4efbedba1de..f7b99a19d50a9 100644 --- a/flang/lib/Frontend/FrontendActions.cpp +++ b/flang/lib/Frontend/FrontendActions.cpp @@ -47,7 +47,6 @@ #include "llvm/Analysis/TargetTransformInfo.h" #include "llvm/Bitcode/BitcodeWriterPass.h" #include "llvm/CodeGen/MachineOptimizationRemarkEmitter.h" -#include "llvm/Extensions/PassPlugin.h" #include "llvm/IR/LLVMRemarkStreamer.h" #include "llvm/IR/LegacyPassManager.h" #include "llvm/IR/Verifier.h" @@ -56,6 +55,7 @@ #include "llvm/Linker/Linker.h" #include "llvm/Object/OffloadBinary.h" #include "llvm/Passes/PassBuilder.h" +#include "llvm/Passes/PassPlugin.h" #include "llvm/Passes/StandardInstrumentations.h" #include "llvm/ProfileData/InstrProfCorrelator.h" #include "llvm/Support/AMDGPUAddrSpace.h" diff --git a/llvm/examples/Bye/Bye.cpp b/llvm/examples/Bye/Bye.cpp index 58d330a381672..4d612e2350a01 100644 --- a/llvm/examples/Bye/Bye.cpp +++ b/llvm/examples/Bye/Bye.cpp @@ -1,8 +1,8 @@ -#include "llvm/Extensions/PassPlugin.h" #include "llvm/IR/Function.h" #include "llvm/IR/LegacyPassManager.h" #include "llvm/Pass.h" #include "llvm/Passes/PassBuilder.h" +#include "llvm/Passes/PassPlugin.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/raw_ostream.h" diff --git a/llvm/examples/IRTransforms/SimplifyCFG.cpp b/llvm/examples/IRTransforms/SimplifyCFG.cpp index 942764cf4e25b..722f5c0ec9dc6 100644 --- a/llvm/examples/IRTransforms/SimplifyCFG.cpp +++ b/llvm/examples/IRTransforms/SimplifyCFG.cpp @@ -33,12 +33,12 @@ //===----------------------------------------------------------------------===// #include "llvm/Analysis/DomTreeUpdater.h" -#include "llvm/Extensions/PassPlugin.h" #include "llvm/IR/Dominators.h" #include "llvm/IR/Function.h" #include "llvm/IR/PassManager.h" #include "llvm/IR/PatternMatch.h" #include "llvm/Passes/PassBuilder.h" +#include "llvm/Passes/PassPlugin.h" #include "llvm/Support/CommandLine.h" using namespace llvm; diff --git a/llvm/include/llvm/Extensions/PassPlugin.h b/llvm/include/llvm/Passes/PassPlugin.h similarity index 96% rename from llvm/include/llvm/Extensions/PassPlugin.h rename to llvm/include/llvm/Passes/PassPlugin.h index a9db5673b506e..c1840b0fabfdb 100644 --- a/llvm/include/llvm/Extensions/PassPlugin.h +++ b/llvm/include/llvm/Passes/PassPlugin.h @@ -1,4 +1,4 @@ -//===----------------------------------------------------------------------===// +//===- llvm/Passes/PassPlugin.h - Public Plugin API -----------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_EXTENSIONS_PASSPLUGIN_H -#define LLVM_EXTENSIONS_PASSPLUGIN_H +#ifndef LLVM_PASSES_PASSPLUGIN_H +#define LLVM_PASSES_PASSPLUGIN_H #include "llvm/ADT/StringRef.h" #include "llvm/Support/CodeGen.h" @@ -112,7 +112,7 @@ class PassPlugin { sys::DynamicLibrary Library; PassPluginLibraryInfo Info; }; -} // namespace llvm +} // The function returns a struct with default initializers. #ifdef __clang__ @@ -139,4 +139,4 @@ llvmGetPassPluginInfo(); #pragma clang diagnostic pop #endif -#endif /* LLVM_EXTENSIONS_PASSPLUGIN_H */ +#endif /* LLVM_PASSES_PASSPLUGIN_H */ diff --git a/llvm/lib/Extensions/CMakeLists.txt b/llvm/lib/Extensions/CMakeLists.txt index 0bfca3ed1949a..c1007dfcde58c 100644 --- a/llvm/lib/Extensions/CMakeLists.txt +++ b/llvm/lib/Extensions/CMakeLists.txt @@ -1,6 +1,5 @@ add_llvm_component_library(LLVMExtensions Extensions.cpp - PassPlugin.cpp LINK_COMPONENTS Support diff --git a/llvm/lib/Extensions/Extensions.cpp b/llvm/lib/Extensions/Extensions.cpp index f8e1be15a2ef0..0d25cbda38e00 100644 --- a/llvm/lib/Extensions/Extensions.cpp +++ b/llvm/lib/Extensions/Extensions.cpp @@ -1,4 +1,4 @@ -#include "llvm/Extensions/PassPlugin.h" +#include "llvm/Passes/PassPlugin.h" #define HANDLE_EXTENSION(Ext) \ llvm::PassPluginLibraryInfo get##Ext##PluginInfo(); #include "llvm/Support/Extension.def" diff --git a/llvm/lib/LTO/LTOBackend.cpp b/llvm/lib/LTO/LTOBackend.cpp index bfda6dec85d87..49b412c9a2991 100644 --- a/llvm/lib/LTO/LTOBackend.cpp +++ b/llvm/lib/LTO/LTOBackend.cpp @@ -22,7 +22,6 @@ #include "llvm/Bitcode/BitcodeReader.h" #include "llvm/Bitcode/BitcodeWriter.h" #include "llvm/CGData/CodeGenData.h" -#include "llvm/Extensions/PassPlugin.h" #include "llvm/IR/LLVMRemarkStreamer.h" #include "llvm/IR/LegacyPassManager.h" #include "llvm/IR/PassManager.h" @@ -31,6 +30,7 @@ #include "llvm/MC/TargetRegistry.h" #include "llvm/Object/ModuleSymbolTable.h" #include "llvm/Passes/PassBuilder.h" +#include "llvm/Passes/PassPlugin.h" #include "llvm/Passes/StandardInstrumentations.h" #include "llvm/Support/Error.h" #include "llvm/Support/FileSystem.h" diff --git a/llvm/lib/Passes/CMakeLists.txt b/llvm/lib/Passes/CMakeLists.txt index 5d7cd3689f3ff..91c8c4f67074d 100644 --- a/llvm/lib/Passes/CMakeLists.txt +++ b/llvm/lib/Passes/CMakeLists.txt @@ -4,6 +4,7 @@ add_llvm_component_library(LLVMPasses PassBuilder.cpp PassBuilderBindings.cpp PassBuilderPipelines.cpp + PassPlugin.cpp StandardInstrumentations.cpp ADDITIONAL_HEADER_DIRS diff --git a/llvm/lib/Extensions/PassPlugin.cpp b/llvm/lib/Passes/PassPlugin.cpp similarity index 93% rename from llvm/lib/Extensions/PassPlugin.cpp rename to llvm/lib/Passes/PassPlugin.cpp index 77dc5ae6f20ac..201f5eef080c3 100644 --- a/llvm/lib/Extensions/PassPlugin.cpp +++ b/llvm/lib/Passes/PassPlugin.cpp @@ -1,4 +1,4 @@ -//===----------------------------------------------------------------------===// +//===- lib/Passes/PassPluginLoader.cpp - Load Plugins for New PM Passes ---===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Extensions/PassPlugin.h" +#include "llvm/Passes/PassPlugin.h" #include "llvm/Support/raw_ostream.h" #include <cstdint> diff --git a/llvm/tools/bugpoint/bugpoint.cpp b/llvm/tools/bugpoint/bugpoint.cpp index c48703c0325b4..52ed135e8bb3e 100644 --- a/llvm/tools/bugpoint/bugpoint.cpp +++ b/llvm/tools/bugpoint/bugpoint.cpp @@ -15,13 +15,13 @@ #include "BugDriver.h" #include "ToolRunner.h" #include "llvm/Config/llvm-config.h" -#include "llvm/Extensions/PassPlugin.h" #include "llvm/IR/LLVMContext.h" #include "llvm/IR/LegacyPassManager.h" #include "llvm/IR/LegacyPassNameParser.h" #include "llvm/InitializePasses.h" #include "llvm/LinkAllIR.h" #include "llvm/LinkAllPasses.h" +#include "llvm/Passes/PassPlugin.h" #include "llvm/Support/AlwaysTrue.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/InitLLVM.h" diff --git a/llvm/tools/llc/CMakeLists.txt b/llvm/tools/llc/CMakeLists.txt index f7a200dc741fb..01825c6e4c64c 100644 --- a/llvm/tools/llc/CMakeLists.txt +++ b/llvm/tools/llc/CMakeLists.txt @@ -8,7 +8,6 @@ set(LLVM_LINK_COMPONENTS CodeGen CodeGenTypes Core - Extensions IRPrinter IRReader MC diff --git a/llvm/tools/llc/llc.cpp b/llvm/tools/llc/llc.cpp index 51c0206e442c2..9f5bec2eeae62 100644 --- a/llvm/tools/llc/llc.cpp +++ b/llvm/tools/llc/llc.cpp @@ -26,7 +26,6 @@ #include "llvm/CodeGen/MachineModuleInfo.h" #include "llvm/CodeGen/TargetPassConfig.h" #include "llvm/CodeGen/TargetSubtargetInfo.h" -#include "llvm/Extensions/PassPlugin.h" #include "llvm/IR/AutoUpgrade.h" #include "llvm/IR/DataLayout.h" #include "llvm/IR/DiagnosticInfo.h" @@ -41,6 +40,7 @@ #include "llvm/MC/MCTargetOptionsCommandFlags.h" #include "llvm/MC/TargetRegistry.h" #include "llvm/Pass.h" +#include "llvm/Passes/PassPlugin.h" #include "llvm/Remarks/HotnessThresholdParser.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Debug.h" diff --git a/llvm/tools/llvm-lto2/CMakeLists.txt b/llvm/tools/llvm-lto2/CMakeLists.txt index 2ddfdfdcb5530..3b4644d6e2771 100644 --- a/llvm/tools/llvm-lto2/CMakeLists.txt +++ b/llvm/tools/llvm-lto2/CMakeLists.txt @@ -6,7 +6,6 @@ set(LLVM_LINK_COMPONENTS BitReader CodeGen Core - Extensions Linker LTO MC diff --git a/llvm/tools/llvm-lto2/llvm-lto2.cpp b/llvm/tools/llvm-lto2/llvm-lto2.cpp index ad6641021157c..ca6864cbf9b91 100644 --- a/llvm/tools/llvm-lto2/llvm-lto2.cpp +++ b/llvm/tools/llvm-lto2/llvm-lto2.cpp @@ -18,9 +18,9 @@ #include "llvm/ADT/ScopeExit.h" #include "llvm/Bitcode/BitcodeReader.h" #include "llvm/CodeGen/CommandFlags.h" -#include "llvm/Extensions/PassPlugin.h" #include "llvm/IR/DiagnosticPrinter.h" #include "llvm/LTO/LTO.h" +#include "llvm/Passes/PassPlugin.h" #include "llvm/Remarks/HotnessThresholdParser.h" #include "llvm/Support/Caching.h" #include "llvm/Support/CommandLine.h" diff --git a/llvm/tools/opt/NewPMDriver.cpp b/llvm/tools/opt/NewPMDriver.cpp index 6c139a64d2d5e..eaa1d8f958a4d 100644 --- a/llvm/tools/opt/NewPMDriver.cpp +++ b/llvm/tools/opt/NewPMDriver.cpp @@ -23,7 +23,6 @@ #include "llvm/Bitcode/BitcodeWriterPass.h" #include "llvm/CodeGen/LibcallLoweringInfo.h" #include "llvm/Config/llvm-config.h" -#include "llvm/Extensions/PassPlugin.h" #include "llvm/IR/Dominators.h" #include "llvm/IR/LLVMContext.h" #include "llvm/IR/Module.h" @@ -31,6 +30,7 @@ #include "llvm/IR/Verifier.h" #include "llvm/IRPrinter/IRPrintingPasses.h" #include "llvm/Passes/PassBuilder.h" +#include "llvm/Passes/PassPlugin.h" #include "llvm/Passes/StandardInstrumentations.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/Timer.h" diff --git a/llvm/tools/opt/optdriver.cpp b/llvm/tools/opt/optdriver.cpp index 5cccef7a64c2b..e8fd5befa1d1d 100644 --- a/llvm/tools/opt/optdriver.cpp +++ b/llvm/tools/opt/optdriver.cpp @@ -24,7 +24,6 @@ #include "llvm/CodeGen/CommandFlags.h" #include "llvm/CodeGen/TargetPassConfig.h" #include "llvm/Config/llvm-config.h" -#include "llvm/Extensions/PassPlugin.h" #include "llvm/IR/DataLayout.h" #include "llvm/IR/DebugInfo.h" #include "llvm/IR/LLVMContext.h" @@ -40,6 +39,7 @@ #include "llvm/LinkAllPasses.h" #include "llvm/MC/MCTargetOptionsCommandFlags.h" #include "llvm/MC/TargetRegistry.h" +#include "llvm/Passes/PassPlugin.h" #include "llvm/Remarks/HotnessThresholdParser.h" #include "llvm/Support/Debug.h" #include "llvm/Support/ErrorHandling.h" diff --git a/llvm/unittests/Analysis/CMakeLists.txt b/llvm/unittests/Analysis/CMakeLists.txt index 3e411a8ac11d6..cd04a779b9467 100644 --- a/llvm/unittests/Analysis/CMakeLists.txt +++ b/llvm/unittests/Analysis/CMakeLists.txt @@ -3,7 +3,6 @@ set(LLVM_LINK_COMPONENTS AsmParser CodeGen Core - Extensions Instrumentation Passes Support diff --git a/llvm/unittests/Analysis/InlineAdvisorPlugin/InlineAdvisorPlugin.cpp b/llvm/unittests/Analysis/InlineAdvisorPlugin/InlineAdvisorPlugin.cpp index d96b593e5e885..beefff2b3b106 100644 --- a/llvm/unittests/Analysis/InlineAdvisorPlugin/InlineAdvisorPlugin.cpp +++ b/llvm/unittests/Analysis/InlineAdvisorPlugin/InlineAdvisorPlugin.cpp @@ -1,8 +1,8 @@ -#include "llvm/Extensions/PassPlugin.h" #include "llvm/IR/Function.h" #include "llvm/IR/Module.h" #include "llvm/Pass.h" #include "llvm/Passes/PassBuilder.h" +#include "llvm/Passes/PassPlugin.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/raw_ostream.h" diff --git a/llvm/unittests/Analysis/InlineOrderPlugin/InlineOrderPlugin.cpp b/llvm/unittests/Analysis/InlineOrderPlugin/InlineOrderPlugin.cpp index db353d971ba4f..9c46c1b8e22ba 100644 --- a/llvm/unittests/Analysis/InlineOrderPlugin/InlineOrderPlugin.cpp +++ b/llvm/unittests/Analysis/InlineOrderPlugin/InlineOrderPlugin.cpp @@ -1,8 +1,8 @@ -#include "llvm/Extensions/PassPlugin.h" #include "llvm/IR/Function.h" #include "llvm/IR/Module.h" #include "llvm/Pass.h" #include "llvm/Passes/PassBuilder.h" +#include "llvm/Passes/PassPlugin.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/raw_ostream.h" diff --git a/llvm/unittests/Analysis/PluginInlineAdvisorAnalysisTest.cpp b/llvm/unittests/Analysis/PluginInlineAdvisorAnalysisTest.cpp index 9cb4a6aee4571..ca4ea8b627e83 100644 --- a/llvm/unittests/Analysis/PluginInlineAdvisorAnalysisTest.cpp +++ b/llvm/unittests/Analysis/PluginInlineAdvisorAnalysisTest.cpp @@ -1,9 +1,9 @@ #include "llvm/Analysis/CallGraph.h" #include "llvm/AsmParser/Parser.h" #include "llvm/Config/config.h" -#include "llvm/Extensions/PassPlugin.h" #include "llvm/IR/Module.h" #include "llvm/Passes/PassBuilder.h" +#include "llvm/Passes/PassPlugin.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Testing/Support/Error.h" diff --git a/llvm/unittests/Analysis/PluginInlineOrderAnalysisTest.cpp b/llvm/unittests/Analysis/PluginInlineOrderAnalysisTest.cpp index ba22170349176..0b31b0892d75a 100644 --- a/llvm/unittests/Analysis/PluginInlineOrderAnalysisTest.cpp +++ b/llvm/unittests/Analysis/PluginInlineOrderAnalysisTest.cpp @@ -1,9 +1,9 @@ #include "llvm/Analysis/CallGraph.h" #include "llvm/AsmParser/Parser.h" #include "llvm/Config/config.h" -#include "llvm/Extensions/PassPlugin.h" #include "llvm/IR/Module.h" #include "llvm/Passes/PassBuilder.h" +#include "llvm/Passes/PassPlugin.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Testing/Support/Error.h" diff --git a/llvm/unittests/Passes/Plugins/CMakeLists.txt b/llvm/unittests/Passes/Plugins/CMakeLists.txt index f3c6b90b36904..9fd543db39c8e 100644 --- a/llvm/unittests/Passes/Plugins/CMakeLists.txt +++ b/llvm/unittests/Passes/Plugins/CMakeLists.txt @@ -3,7 +3,7 @@ # work with DLLs on Windows (where a shared library can't have undefined # references), so just skip this testcase on Windows. if (NOT WIN32 AND NOT CYGWIN) - set(LLVM_LINK_COMPONENTS Support Extensions Passes Core AsmParser) + set(LLVM_LINK_COMPONENTS Support Passes Core AsmParser) add_llvm_unittest(PluginsTests PluginsTest.cpp diff --git a/llvm/unittests/Passes/Plugins/DoublerPlugin/DoublerPlugin.cpp b/llvm/unittests/Passes/Plugins/DoublerPlugin/DoublerPlugin.cpp index 42667ff2f5120..102b13cf19bab 100644 --- a/llvm/unittests/Passes/Plugins/DoublerPlugin/DoublerPlugin.cpp +++ b/llvm/unittests/Passes/Plugins/DoublerPlugin/DoublerPlugin.cpp @@ -7,9 +7,9 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Extensions/PassPlugin.h" #include "llvm/IR/Module.h" #include "llvm/Passes/PassBuilder.h" +#include "llvm/Passes/PassPlugin.h" using namespace llvm; diff --git a/llvm/unittests/Passes/Plugins/PluginsTest.cpp b/llvm/unittests/Passes/Plugins/PluginsTest.cpp index bb1199177bbc8..b1f09e966d6e5 100644 --- a/llvm/unittests/Passes/Plugins/PluginsTest.cpp +++ b/llvm/unittests/Passes/Plugins/PluginsTest.cpp @@ -9,11 +9,11 @@ #include "llvm/Analysis/CGSCCPassManager.h" #include "llvm/AsmParser/Parser.h" #include "llvm/Config/config.h" -#include "llvm/Extensions/PassPlugin.h" #include "llvm/IR/GlobalVariable.h" #include "llvm/IR/Module.h" #include "llvm/IR/PassManager.h" #include "llvm/Passes/PassBuilder.h" +#include "llvm/Passes/PassPlugin.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/Path.h" #include "llvm/Support/SourceMgr.h" diff --git a/llvm/unittests/Passes/Plugins/TestPlugin/TestPlugin.cpp b/llvm/unittests/Passes/Plugins/TestPlugin/TestPlugin.cpp index 15db0c56feb15..f9623b700172a 100644 --- a/llvm/unittests/Passes/Plugins/TestPlugin/TestPlugin.cpp +++ b/llvm/unittests/Passes/Plugins/TestPlugin/TestPlugin.cpp @@ -6,8 +6,8 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Extensions/PassPlugin.h" #include "llvm/Passes/PassBuilder.h" +#include "llvm/Passes/PassPlugin.h" #include "../TestPlugin.h" diff --git a/polly/lib/CMakeLists.txt b/polly/lib/CMakeLists.txt index 5a99d26e6b08f..7c609fda0a61a 100644 --- a/polly/lib/CMakeLists.txt +++ b/polly/lib/CMakeLists.txt @@ -23,7 +23,6 @@ set(POLLY_COMPONENTS Analysis ipo MC - Extensions Passes Linker IRReader diff --git a/polly/lib/Plugin/Polly.cpp b/polly/lib/Plugin/Polly.cpp index 6be19ae02a66c..f567d37c07eab 100644 --- a/polly/lib/Plugin/Polly.cpp +++ b/polly/lib/Plugin/Polly.cpp @@ -9,8 +9,8 @@ //===----------------------------------------------------------------------===// #include "polly/RegisterPasses.h" -#include "llvm/Extensions/PassPlugin.h" #include "llvm/PassRegistry.h" +#include "llvm/Passes/PassPlugin.h" // Pass Plugin Entrypoints diff --git a/polly/lib/Support/RegisterPasses.cpp b/polly/lib/Support/RegisterPasses.cpp index edd8c1c19d2ae..a430beebae7b1 100644 --- a/polly/lib/Support/RegisterPasses.cpp +++ b/polly/lib/Support/RegisterPasses.cpp @@ -42,11 +42,11 @@ #include "polly/Support/DumpModulePass.h" #include "llvm/Analysis/CFGPrinter.h" #include "llvm/Config/llvm-config.h" // for LLVM_VERSION_STRING -#include "llvm/Extensions/PassPlugin.h" #include "llvm/IR/LegacyPassManager.h" #include "llvm/IR/PassManager.h" #include "llvm/IR/Verifier.h" #include "llvm/Passes/PassBuilder.h" +#include "llvm/Passes/PassPlugin.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Error.h" #include "llvm/Support/TargetSelect.h" _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
