diff options
12 files changed, 15 insertions, 16 deletions
diff --git a/llvm/include/llvm/Transforms/Utils/InstructionPrecedenceTracking.h b/llvm/include/llvm/Analysis/InstructionPrecedenceTracking.h index 6a326924df8..a9ec85f7a6c 100644 --- a/llvm/include/llvm/Transforms/Utils/InstructionPrecedenceTracking.h +++ b/llvm/include/llvm/Analysis/InstructionPrecedenceTracking.h @@ -18,11 +18,11 @@ // a content of some tracked block is changed. //===----------------------------------------------------------------------===// -#ifndef LLVM_TRANSFORMS_UTILS_INSTRUCTIONPRECEDENCETRACKING_H -#define LLVM_TRANSFORMS_UTILS_INSTRUCTIONPRECEDENCETRACKING_H +#ifndef LLVM_ANALYSIS_INSTRUCTIONPRECEDENCETRACKING_H +#define LLVM_ANALYSIS_INSTRUCTIONPRECEDENCETRACKING_H #include "llvm/IR/Dominators.h" -#include "llvm/Transforms/Utils/OrderedInstructions.h" +#include "llvm/Analysis/OrderedInstructions.h" namespace llvm { @@ -105,4 +105,4 @@ public: } // llvm -#endif // LLVM_TRANSFORMS_UTILS_INSTRUCTIONPRECEDENCETRACKING_H +#endif // LLVM_ANALYSIS_INSTRUCTIONPRECEDENCETRACKING_H diff --git a/llvm/include/llvm/Transforms/Utils/OrderedInstructions.h b/llvm/include/llvm/Analysis/OrderedInstructions.h index 7f57fde638b..7e3850b87c5 100644 --- a/llvm/include/llvm/Transforms/Utils/OrderedInstructions.h +++ b/llvm/include/llvm/Analysis/OrderedInstructions.h @@ -17,8 +17,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_TRANSFORMS_UTILS_ORDEREDINSTRUCTIONS_H -#define LLVM_TRANSFORMS_UTILS_ORDEREDINSTRUCTIONS_H +#ifndef LLVM_ANALYSIS_ORDEREDINSTRUCTIONS_H +#define LLVM_ANALYSIS_ORDEREDINSTRUCTIONS_H #include "llvm/ADT/DenseMap.h" #include "llvm/Analysis/OrderedBasicBlock.h" @@ -62,4 +62,4 @@ public: } // end namespace llvm -#endif // LLVM_TRANSFORMS_UTILS_ORDEREDINSTRUCTIONS_H +#endif // LLVM_ANALYSIS_ORDEREDINSTRUCTIONS_H diff --git a/llvm/include/llvm/Transforms/Scalar/GVN.h b/llvm/include/llvm/Transforms/Scalar/GVN.h index 8bdd084b401..c01a1d77e96 100644 --- a/llvm/include/llvm/Transforms/Scalar/GVN.h +++ b/llvm/include/llvm/Transforms/Scalar/GVN.h @@ -22,13 +22,13 @@ #include "llvm/ADT/SetVector.h" #include "llvm/ADT/SmallVector.h" #include "llvm/Analysis/AliasAnalysis.h" +#include "llvm/Analysis/InstructionPrecedenceTracking.h" #include "llvm/Analysis/MemoryDependenceAnalysis.h" #include "llvm/IR/Dominators.h" #include "llvm/IR/InstrTypes.h" #include "llvm/IR/PassManager.h" #include "llvm/Support/Allocator.h" #include "llvm/Support/Compiler.h" -#include "llvm/Transforms/Utils/InstructionPrecedenceTracking.h" #include <cstdint> #include <utility> #include <vector> diff --git a/llvm/include/llvm/Transforms/Utils/PredicateInfo.h b/llvm/include/llvm/Transforms/Utils/PredicateInfo.h index b53eda7e5a4..2fc38089f3f 100644 --- a/llvm/include/llvm/Transforms/Utils/PredicateInfo.h +++ b/llvm/include/llvm/Transforms/Utils/PredicateInfo.h @@ -60,6 +60,7 @@ #include "llvm/ADT/ilist_node.h" #include "llvm/ADT/iterator.h" #include "llvm/Analysis/AssumptionCache.h" +#include "llvm/Analysis/OrderedInstructions.h" #include "llvm/IR/BasicBlock.h" #include "llvm/IR/Dominators.h" #include "llvm/IR/Instructions.h" @@ -76,7 +77,6 @@ #include "llvm/Support/Casting.h" #include "llvm/Support/Compiler.h" #include "llvm/Support/ErrorHandling.h" -#include "llvm/Transforms/Utils/OrderedInstructions.h" #include <algorithm> #include <cassert> #include <cstddef> diff --git a/llvm/lib/Analysis/CMakeLists.txt b/llvm/lib/Analysis/CMakeLists.txt index eb0526c5dce..6a228e85aa8 100644 --- a/llvm/lib/Analysis/CMakeLists.txt +++ b/llvm/lib/Analysis/CMakeLists.txt @@ -35,6 +35,7 @@ add_llvm_library(LLVMAnalysis IndirectCallPromotionAnalysis.cpp InlineCost.cpp InstCount.cpp + InstructionPrecedenceTracking.cpp InstructionSimplify.cpp Interval.cpp IntervalPartition.cpp @@ -65,6 +66,7 @@ add_llvm_library(LLVMAnalysis ObjCARCInstKind.cpp OptimizationRemarkEmitter.cpp OrderedBasicBlock.cpp + OrderedInstructions.cpp PHITransAddr.cpp PhiValues.cpp PostDominators.cpp diff --git a/llvm/lib/Transforms/Utils/InstructionPrecedenceTracking.cpp b/llvm/lib/Analysis/InstructionPrecedenceTracking.cpp index a3817c29551..7294e121507 100644 --- a/llvm/lib/Transforms/Utils/InstructionPrecedenceTracking.cpp +++ b/llvm/lib/Analysis/InstructionPrecedenceTracking.cpp @@ -18,8 +18,8 @@ // a content of some tracked block is changed. //===----------------------------------------------------------------------===// +#include "llvm/Analysis/InstructionPrecedenceTracking.h" #include "llvm/Analysis/ValueTracking.h" -#include "llvm/Transforms/Utils/InstructionPrecedenceTracking.h" using namespace llvm; diff --git a/llvm/lib/Transforms/Utils/OrderedInstructions.cpp b/llvm/lib/Analysis/OrderedInstructions.cpp index 6d0b96f6aa8..7b155208c02 100644 --- a/llvm/lib/Transforms/Utils/OrderedInstructions.cpp +++ b/llvm/lib/Analysis/OrderedInstructions.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Transforms/Utils/OrderedInstructions.h" +#include "llvm/Analysis/OrderedInstructions.h" using namespace llvm; bool OrderedInstructions::localDominates(const Instruction *InstA, diff --git a/llvm/lib/Transforms/Utils/CMakeLists.txt b/llvm/lib/Transforms/Utils/CMakeLists.txt index 3dd5fe81166..eb3bad79129 100644 --- a/llvm/lib/Transforms/Utils/CMakeLists.txt +++ b/llvm/lib/Transforms/Utils/CMakeLists.txt @@ -22,7 +22,6 @@ add_llvm_library(LLVMTransformUtils InlineFunction.cpp ImportedFunctionsInliningStatistics.cpp InstructionNamer.cpp - InstructionPrecedenceTracking.cpp IntegerDivision.cpp LCSSA.cpp LibCallsShrinkWrap.cpp @@ -42,7 +41,6 @@ add_llvm_library(LLVMTransformUtils MetaRenamer.cpp ModuleUtils.cpp NameAnonGlobals.cpp - OrderedInstructions.cpp PredicateInfo.cpp PromoteMemoryToRegister.cpp StripGCRelocates.cpp diff --git a/llvm/lib/Transforms/Utils/PredicateInfo.cpp b/llvm/lib/Transforms/Utils/PredicateInfo.cpp index 2923977b791..e56ccef1289 100644 --- a/llvm/lib/Transforms/Utils/PredicateInfo.cpp +++ b/llvm/lib/Transforms/Utils/PredicateInfo.cpp @@ -35,7 +35,6 @@ #include "llvm/Support/DebugCounter.h" #include "llvm/Support/FormattedStream.h" #include "llvm/Transforms/Utils.h" -#include "llvm/Transforms/Utils/OrderedInstructions.h" #include <algorithm> #define DEBUG_TYPE "predicateinfo" using namespace llvm; diff --git a/llvm/unittests/Analysis/CMakeLists.txt b/llvm/unittests/Analysis/CMakeLists.txt index f6ff29064be..8ad0570bc4d 100644 --- a/llvm/unittests/Analysis/CMakeLists.txt +++ b/llvm/unittests/Analysis/CMakeLists.txt @@ -20,6 +20,7 @@ add_llvm_unittest(AnalysisTests MemoryBuiltinsTest.cpp MemorySSA.cpp OrderedBasicBlockTest.cpp + OrderedInstructions.cpp PhiValuesTest.cpp ProfileSummaryInfoTest.cpp ScalarEvolutionTest.cpp diff --git a/llvm/unittests/Transforms/Utils/OrderedInstructions.cpp b/llvm/unittests/Analysis/OrderedInstructions.cpp index 1d6df172294..dc1b25b8c02 100644 --- a/llvm/unittests/Transforms/Utils/OrderedInstructions.cpp +++ b/llvm/unittests/Analysis/OrderedInstructions.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Transforms/Utils/OrderedInstructions.h" +#include "llvm/Analysis/OrderedInstructions.h" #include "llvm/IR/BasicBlock.h" #include "llvm/IR/Dominators.h" #include "llvm/IR/IRBuilder.h" diff --git a/llvm/unittests/Transforms/Utils/CMakeLists.txt b/llvm/unittests/Transforms/Utils/CMakeLists.txt index 9781b0aaedb..7b36521f774 100644 --- a/llvm/unittests/Transforms/Utils/CMakeLists.txt +++ b/llvm/unittests/Transforms/Utils/CMakeLists.txt @@ -14,7 +14,6 @@ add_llvm_unittest(UtilsTests FunctionComparator.cpp IntegerDivision.cpp Local.cpp - OrderedInstructions.cpp SSAUpdaterBulk.cpp ValueMapperTest.cpp ) |
