llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: David Sherwood (david-arm) <details> <summary>Changes</summary> Sometimes code depends upon the constant variables declared in OptimizationLevel (e.g. see #<!-- -->156802), which then requires them to add a dependency on the Passes directory. Given that code is much more likely to depend upon Support than Passes I believe it makes sense to move OptimizationLevel to Support. The Passes component already depends upon Support. --- Full diff: https://github.com/llvm/llvm-project/pull/157057.diff 8 Files Affected: - (modified) clang/tools/clang-fuzzer/handle-llvm/handle_llvm.cpp (+1-1) - (modified) llvm/include/llvm/Passes/PassBuilder.h (+1-1) - (renamed) llvm/include/llvm/Support/OptimizationLevel.h () - (modified) llvm/lib/Passes/CMakeLists.txt (-1) - (modified) llvm/lib/Passes/PassBuilder.cpp (+1-1) - (modified) llvm/lib/Passes/PassBuilderPipelines.cpp (+2-2) - (modified) llvm/lib/Support/CMakeLists.txt (+1) - (renamed) llvm/lib/Support/OptimizationLevel.cpp (+1-1) ``````````diff diff --git a/clang/tools/clang-fuzzer/handle-llvm/handle_llvm.cpp b/clang/tools/clang-fuzzer/handle-llvm/handle_llvm.cpp index 798b34b3ef0af..edaf0fa887720 100644 --- a/clang/tools/clang-fuzzer/handle-llvm/handle_llvm.cpp +++ b/clang/tools/clang-fuzzer/handle-llvm/handle_llvm.cpp @@ -34,9 +34,9 @@ #include "llvm/IRPrinter/IRPrintingPasses.h" #include "llvm/IRReader/IRReader.h" #include "llvm/MC/TargetRegistry.h" -#include "llvm/Passes/OptimizationLevel.h" #include "llvm/Passes/PassBuilder.h" #include "llvm/Support/MemoryBuffer.h" +#include "llvm/Support/OptimizationLevel.h" #include "llvm/Support/SourceMgr.h" #include "llvm/Support/TargetSelect.h" #include "llvm/Target/TargetMachine.h" diff --git a/llvm/include/llvm/Passes/PassBuilder.h b/llvm/include/llvm/Passes/PassBuilder.h index 9cdb7ca7dbc9b..64bdb84a68d78 100644 --- a/llvm/include/llvm/Passes/PassBuilder.h +++ b/llvm/include/llvm/Passes/PassBuilder.h @@ -19,9 +19,9 @@ #include "llvm/CodeGen/MachinePassManager.h" #include "llvm/CodeGen/RegAllocCommon.h" #include "llvm/IR/PassManager.h" -#include "llvm/Passes/OptimizationLevel.h" #include "llvm/Support/Compiler.h" #include "llvm/Support/Error.h" +#include "llvm/Support/OptimizationLevel.h" #include "llvm/Support/PGOOptions.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Transforms/IPO/Inliner.h" diff --git a/llvm/include/llvm/Passes/OptimizationLevel.h b/llvm/include/llvm/Support/OptimizationLevel.h similarity index 100% rename from llvm/include/llvm/Passes/OptimizationLevel.h rename to llvm/include/llvm/Support/OptimizationLevel.h diff --git a/llvm/lib/Passes/CMakeLists.txt b/llvm/lib/Passes/CMakeLists.txt index 91c8c4f67074d..6f1ade87bc431 100644 --- a/llvm/lib/Passes/CMakeLists.txt +++ b/llvm/lib/Passes/CMakeLists.txt @@ -1,6 +1,5 @@ add_llvm_component_library(LLVMPasses CodeGenPassBuilder.cpp - OptimizationLevel.cpp PassBuilder.cpp PassBuilderBindings.cpp PassBuilderPipelines.cpp diff --git a/llvm/lib/Passes/PassBuilder.cpp b/llvm/lib/Passes/PassBuilder.cpp index 587f0ece0859b..ef18bd132499f 100644 --- a/llvm/lib/Passes/PassBuilder.cpp +++ b/llvm/lib/Passes/PassBuilder.cpp @@ -184,12 +184,12 @@ #include "llvm/IR/SafepointIRVerifier.h" #include "llvm/IR/Verifier.h" #include "llvm/IRPrinter/IRPrintingPasses.h" -#include "llvm/Passes/OptimizationLevel.h" #include "llvm/Support/CodeGen.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Debug.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/FormatVariadic.h" +#include "llvm/Support/OptimizationLevel.h" #include "llvm/Support/Regex.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Transforms/AggressiveInstCombine/AggressiveInstCombine.h" diff --git a/llvm/lib/Passes/PassBuilderPipelines.cpp b/llvm/lib/Passes/PassBuilderPipelines.cpp index 98821bb1408a7..cd6fc51ceafec 100644 --- a/llvm/lib/Passes/PassBuilderPipelines.cpp +++ b/llvm/lib/Passes/PassBuilderPipelines.cpp @@ -26,10 +26,10 @@ #include "llvm/Analysis/TypeBasedAliasAnalysis.h" #include "llvm/IR/PassManager.h" #include "llvm/Pass.h" -#include "llvm/Passes/OptimizationLevel.h" #include "llvm/Passes/PassBuilder.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/ErrorHandling.h" +#include "llvm/Support/OptimizationLevel.h" #include "llvm/Support/PGOOptions.h" #include "llvm/Support/VirtualFileSystem.h" #include "llvm/Target/TargetMachine.h" @@ -2355,4 +2355,4 @@ AAManager PassBuilder::buildDefaultAAPipeline() { bool PassBuilder::isInstrumentedPGOUse() const { return (PGOOpt && PGOOpt->Action == PGOOptions::IRUse) || !UseCtxProfile.empty(); -} \ No newline at end of file +} diff --git a/llvm/lib/Support/CMakeLists.txt b/llvm/lib/Support/CMakeLists.txt index b29dda46b757f..cb882f80bc467 100644 --- a/llvm/lib/Support/CMakeLists.txt +++ b/llvm/lib/Support/CMakeLists.txt @@ -224,6 +224,7 @@ add_llvm_component_library(LLVMSupport MSP430AttributeParser.cpp Mustache.cpp NativeFormatting.cpp + OptimizationLevel.cpp OptimizedStructLayout.cpp Optional.cpp OptionStrCmp.cpp diff --git a/llvm/lib/Passes/OptimizationLevel.cpp b/llvm/lib/Support/OptimizationLevel.cpp similarity index 95% rename from llvm/lib/Passes/OptimizationLevel.cpp rename to llvm/lib/Support/OptimizationLevel.cpp index a1f8c1e14b1f0..28b742f609065 100644 --- a/llvm/lib/Passes/OptimizationLevel.cpp +++ b/llvm/lib/Support/OptimizationLevel.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Passes/OptimizationLevel.h" +#include "llvm/Support/OptimizationLevel.h" using namespace llvm; `````````` </details> https://github.com/llvm/llvm-project/pull/157057 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
