diff options
66 files changed, 45 insertions, 491 deletions
diff --git a/polly/include/polly/Canonicalization.h b/polly/include/polly/Canonicalization.h index 28f5e2d2415..763f2df629a 100644 --- a/polly/include/polly/Canonicalization.h +++ b/polly/include/polly/Canonicalization.h @@ -9,7 +9,11 @@ #ifndef POLLY_CANONICALIZATION_H #define POLLY_CANONICALIZATION_H -#include "llvm/IR/LegacyPassManager.h" +namespace llvm { +namespace legacy { +class PassManagerBase; +} +} // namespace llvm namespace polly { diff --git a/polly/include/polly/CodeGen/BlockGenerators.h b/polly/include/polly/CodeGen/BlockGenerators.h index 6cb41e4c201..f2c52c8fedc 100644 --- a/polly/include/polly/CodeGen/BlockGenerators.h +++ b/polly/include/polly/CodeGen/BlockGenerators.h @@ -16,24 +16,12 @@ #define POLLY_BLOCK_GENERATORS_H #include "polly/CodeGen/IRBuilder.h" -#include "polly/Support/GICHelper.h" #include "polly/Support/ScopHelper.h" -#include "llvm/ADT/MapVector.h" #include "llvm/Analysis/ScalarEvolutionExpressions.h" -#include "isl/map.h" - -struct isl_ast_build; -struct isl_id_to_ast_expr; - -namespace llvm { -class Pass; -class Region; -class ScalarEvolution; -} // namespace llvm +#include "isl/isl-noexceptions.h" namespace polly { using namespace llvm; -class ScopStmt; class MemoryAccess; class ScopArrayInfo; class IslExprBuilder; diff --git a/polly/include/polly/CodeGen/CodeGeneration.h b/polly/include/polly/CodeGen/CodeGeneration.h index 02b77d73fe6..b32f31299c6 100644 --- a/polly/include/polly/CodeGen/CodeGeneration.h +++ b/polly/include/polly/CodeGen/CodeGeneration.h @@ -9,20 +9,12 @@ #ifndef POLLY_CODEGENERATION_H #define POLLY_CODEGENERATION_H -#include "IRBuilder.h" -#include "polly/Config/config.h" +#include "polly/CodeGen/IRBuilder.h" #include "polly/ScopPass.h" #include "llvm/IR/PassManager.h" -namespace llvm { - -class BasicBlock; -} // namespace llvm - namespace polly { -class Scop; - enum VectorizerChoice { VECTORIZER_NONE, VECTORIZER_STRIPMINE, diff --git a/polly/include/polly/CodeGen/IRBuilder.h b/polly/include/polly/CodeGen/IRBuilder.h index 2649068ce5a..8033ffafb7d 100644 --- a/polly/include/polly/CodeGen/IRBuilder.h +++ b/polly/include/polly/CodeGen/IRBuilder.h @@ -15,12 +15,11 @@ #define POLLY_CODEGEN_IRBUILDER_H #include "llvm/ADT/MapVector.h" -#include "llvm/Analysis/LoopInfo.h" -#include "llvm/Analysis/ScalarEvolution.h" #include "llvm/IR/IRBuilder.h" -#include "llvm/IR/ValueMap.h" namespace llvm { +class Loop; +class SCEV; class ScalarEvolution; } // namespace llvm diff --git a/polly/include/polly/CodeGen/IslAst.h b/polly/include/polly/CodeGen/IslAst.h index 89d8aa5beed..1a842b87d6d 100644 --- a/polly/include/polly/CodeGen/IslAst.h +++ b/polly/include/polly/CodeGen/IslAst.h @@ -21,34 +21,14 @@ #ifndef POLLY_ISLAST_H #define POLLY_ISLAST_H -#include "polly/Config/config.h" #include "polly/ScopPass.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/IR/PassManager.h" -#include "isl/ast.h" #include "isl/ctx.h" -#include <memory> - -namespace llvm { - -class PassRegistry; -class raw_ostream; - -void initializeIslAstInfoWrapperPassPass(PassRegistry &); -} // namespace llvm - -struct isl_ast_build; -struct isl_ast_expr; -struct isl_ast_node; -struct isl_pw_aff; -struct isl_pw_multi_aff; -struct isl_union_map; namespace polly { struct Dependences; -class MemoryAccess; -class Scop; class IslAst { public: diff --git a/polly/include/polly/CodeGen/IslExprBuilder.h b/polly/include/polly/CodeGen/IslExprBuilder.h index 9e3764ab974..fe727cd85fa 100644 --- a/polly/include/polly/CodeGen/IslExprBuilder.h +++ b/polly/include/polly/CodeGen/IslExprBuilder.h @@ -13,19 +13,9 @@ #include "polly/CodeGen/IRBuilder.h" #include "polly/Support/ScopHelper.h" - -#include "llvm/ADT/MapVector.h" -#include "isl/ast.h" #include "isl/isl-noexceptions.h" namespace llvm { -class DataLayout; -class ScalarEvolution; -} // namespace llvm - -struct isl_id; - -namespace llvm { // Provide PointerLikeTypeTraits for isl_id. template <> struct PointerLikeTypeTraits<isl_id *> { diff --git a/polly/include/polly/CodeGen/IslNodeBuilder.h b/polly/include/polly/CodeGen/IslNodeBuilder.h index 935922d9e0d..47bec726e73 100644 --- a/polly/include/polly/CodeGen/IslNodeBuilder.h +++ b/polly/include/polly/CodeGen/IslNodeBuilder.h @@ -17,48 +17,20 @@ #include "polly/CodeGen/BlockGenerators.h" #include "polly/CodeGen/IslExprBuilder.h" #include "polly/ScopDetectionDiagnostic.h" -#include "polly/Support/ScopHelper.h" #include "llvm/ADT/ArrayRef.h" -#include "llvm/ADT/SetVector.h" #include "llvm/ADT/SmallSet.h" -#include "llvm/ADT/SmallVector.h" -#include "llvm/Analysis/ScalarEvolutionExpressions.h" #include "llvm/IR/InstrTypes.h" #include "isl/ctx.h" #include "isl/isl-noexceptions.h" -#include <utility> -#include <vector> using namespace llvm; using namespace polly; -namespace llvm { - -class BasicBlock; -class DataLayout; -class DominatorTree; -class Function; -class Instruction; -class Loop; -class LoopInfo; -class ScalarEvolution; -class SCEV; -class Type; -class Value; -} // namespace llvm - namespace polly { struct InvariantEquivClassTy; -class MemoryAccess; -class Scop; -class ScopStmt; } // namespace polly -struct isl_ast_node; -struct isl_ast_build; -struct isl_union_map; - struct SubtreeReferences { LoopInfo &LI; ScalarEvolution &SE; diff --git a/polly/include/polly/CodeGen/LoopGenerators.h b/polly/include/polly/CodeGen/LoopGenerators.h index 39ff3a78e04..152f816a06c 100644 --- a/polly/include/polly/CodeGen/LoopGenerators.h +++ b/polly/include/polly/CodeGen/LoopGenerators.h @@ -15,15 +15,7 @@ #include "polly/CodeGen/IRBuilder.h" #include "polly/Support/ScopHelper.h" - #include "llvm/ADT/SetVector.h" -#include "llvm/IR/ValueMap.h" - -namespace llvm { -class Value; -class Pass; -class BasicBlock; -} // namespace llvm namespace polly { using namespace llvm; diff --git a/polly/include/polly/CodeGen/LoopGeneratorsGOMP.h b/polly/include/polly/CodeGen/LoopGeneratorsGOMP.h index 641d0dd0892..083be75ab2f 100644 --- a/polly/include/polly/CodeGen/LoopGeneratorsGOMP.h +++ b/polly/include/polly/CodeGen/LoopGeneratorsGOMP.h @@ -16,15 +16,7 @@ #include "polly/CodeGen/IRBuilder.h" #include "polly/CodeGen/LoopGenerators.h" #include "polly/Support/ScopHelper.h" - #include "llvm/ADT/SetVector.h" -#include "llvm/IR/ValueMap.h" - -namespace llvm { -class Value; -class Pass; -class BasicBlock; -} // namespace llvm namespace polly { using namespace llvm; diff --git a/polly/include/polly/CodeGen/LoopGeneratorsKMP.h b/polly/include/polly/CodeGen/LoopGeneratorsKMP.h index 9adcd56b159..d9a6916f1cd 100644 --- a/polly/include/polly/CodeGen/LoopGeneratorsKMP.h +++ b/polly/include/polly/CodeGen/LoopGeneratorsKMP.h @@ -16,15 +16,7 @@ #include "polly/CodeGen/IRBuilder.h" #include "polly/CodeGen/LoopGenerators.h" #include "polly/Support/ScopHelper.h" - #include "llvm/ADT/SetVector.h" -#include "llvm/IR/ValueMap.h" - -namespace llvm { -class Value; -class Pass; -class BasicBlock; -} // namespace llvm namespace polly { using namespace llvm; diff --git a/polly/include/polly/CodeGen/PerfMonitor.h b/polly/include/polly/CodeGen/PerfMonitor.h index 0f7b0fdaaca..81aa4c7ee44 100644 --- a/polly/include/polly/CodeGen/PerfMonitor.h +++ b/polly/include/polly/CodeGen/PerfMonitor.h @@ -11,13 +11,6 @@ #include "polly/CodeGen/IRBuilder.h" -namespace llvm { -class Function; -class Module; -class Value; -class Instruction; -} // namespace llvm - namespace polly { class PerfMonitor { diff --git a/polly/include/polly/DeLICM.h b/polly/include/polly/DeLICM.h index e5e9c5cd325..7ef382fd548 100644 --- a/polly/include/polly/DeLICM.h +++ b/polly/include/polly/DeLICM.h @@ -17,11 +17,12 @@ #ifndef POLLY_DELICM_H #define POLLY_DELICM_H -#include "polly/Support/GICHelper.h" +#include "isl/isl-noexceptions.h" namespace llvm { class PassRegistry; class Pass; +class raw_ostream; } // namespace llvm namespace polly { diff --git a/polly/include/polly/DependenceInfo.h b/polly/include/polly/DependenceInfo.h index 6198fbf5922..d66be816349 100644 --- a/polly/include/polly/DependenceInfo.h +++ b/polly/include/polly/DependenceInfo.h @@ -26,21 +26,10 @@ #include "isl/ctx.h" #include "isl/isl-noexceptions.h" -struct isl_pw_aff; -struct isl_union_map; -struct isl_union_set; -struct isl_map; -struct isl_set; -struct clast_for; - using namespace llvm; namespace polly { -class Scop; -class ScopStmt; -class MemoryAccess; - /// The accumulated dependence information for a SCoP. /// /// The Dependences struct holds all dependence information we collect and @@ -313,7 +302,6 @@ private: } // namespace polly namespace llvm { -class PassRegistry; void initializeDependenceInfoPass(llvm::PassRegistry &); void initializeDependenceInfoWrapperPassPass(llvm::PassRegistry &); } // namespace llvm diff --git a/polly/include/polly/FlattenAlgo.h b/polly/include/polly/FlattenAlgo.h index ce4a938cb41..6fdca8f08eb 100644 --- a/polly/include/polly/FlattenAlgo.h +++ b/polly/include/polly/FlattenAlgo.h @@ -14,7 +14,7 @@ #ifndef POLLY_FLATTENALGO_H #define POLLY_FLATTENALGO_H -#include "polly/Support/GICHelper.h" +#include "isl/isl-noexceptions.h" namespace polly { /// Recursively flatten a schedule. diff --git a/polly/include/polly/LinkAllPasses.h b/polly/include/polly/LinkAllPasses.h index 09bbf9b63ae..ed05f836d45 100644 --- a/polly/include/polly/LinkAllPasses.h +++ b/polly/include/polly/LinkAllPasses.h @@ -24,9 +24,7 @@ namespace llvm { class Pass; -class PassInfo; class PassRegistry; -class RegionPass; } // namespace llvm namespace polly { diff --git a/polly/include/polly/PolyhedralInfo.h b/polly/include/polly/PolyhedralInfo.h index 46893d18d48..cec288d7cd0 100644 --- a/polly/include/polly/PolyhedralInfo.h +++ b/polly/include/polly/PolyhedralInfo.h @@ -17,8 +17,9 @@ #define POLLY_POLYHEDRAL_INFO_H #include "llvm/Pass.h" +#include "isl/aff_type.h" #include "isl/ctx.h" -#include "isl/union_map.h" +#include "isl/union_map_type.h" namespace llvm { class Loop; diff --git a/polly/include/polly/RegisterPasses.h b/polly/include/polly/RegisterPasses.h index 9a0ae0460a7..2126db9c2df 100644 --- a/polly/include/polly/RegisterPasses.h +++ b/polly/include/polly/RegisterPasses.h @@ -13,9 +13,8 @@ #ifndef POLLY_REGISTER_PASSES_H #define POLLY_REGISTER_PASSES_H -#include "llvm/IR/LegacyPassManager.h" - namespace llvm { +class PassRegistry; namespace legacy { class PassManagerBase; } // namespace legacy diff --git a/polly/include/polly/ScopBuilder.h b/polly/include/polly/ScopBuilder.h index 5f23cdb392d..54d48bec070 100644 --- a/polly/include/polly/ScopBuilder.h +++ b/polly/include/polly/ScopBuilder.h @@ -20,30 +20,6 @@ #include "polly/Support/ScopHelper.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/SetVector.h" -#include "llvm/ADT/SmallVector.h" -#include <algorithm> -#include <memory> -#include <utility> - -namespace llvm { - -class AssumptionCache; -class BasicBlock; -class DataLayout; -class DominatorTree; -class Instruction; -class LoopInfo; -class PassRegistry; -class PHINode; -class Region; -class ScalarEvolution; -class SCEV; -class Type; -class Value; - -void initializeScopInfoRegionPassPass(PassRegistry &); -void initializeScopInfoWrapperPassPass(PassRegistry &); -} // end namespace llvm namespace polly { diff --git a/polly/include/polly/ScopDetection.h b/polly/include/polly/ScopDetection.h index 292816c01e6..a174b4b0d9b 100644 --- a/polly/include/polly/ScopDetection.h +++ b/polly/include/polly/ScopDetection.h @@ -48,46 +48,16 @@ #include "polly/ScopDetectionDiagnostic.h" #include "polly/Support/ScopHelper.h" -#include "llvm/ADT/DenseMap.h" -#include "llvm/ADT/SetVector.h" -#include "llvm/ADT/SmallVector.h" -#include "llvm/ADT/StringRef.h" #include "llvm/Analysis/AliasAnalysis.h" #include "llvm/Analysis/AliasSetTracker.h" #include "llvm/Analysis/RegionInfo.h" #include "llvm/Analysis/ScalarEvolutionExpressions.h" #include "llvm/Pass.h" -#include <algorithm> -#include <map> -#include <memory> #include <set> -#include <string> -#include <utility> -#include <vector> using namespace llvm; namespace llvm { - -class BasicBlock; -class BranchInst; -class CallInst; -class DebugLoc; -class DominatorTree; -class Function; -class Instruction; -class IntrinsicInst; -class Loop; -class LoopInfo; -class OptimizationRemarkEmitter; -class PassRegistry; -class raw_ostream; -class ScalarEvolution; -class SCEV; -class SCEVUnknown; -class SwitchInst; -class Value; - void initializeScopDetectionWrapperPassPass(PassRegistry &); } // namespace llvm diff --git a/polly/include/polly/ScopDetectionDiagnostic.h b/polly/include/polly/ScopDetectionDiagnostic.h index 4db784c672d..68246158461 100644 --- a/polly/include/polly/ScopDetectionDiagnostic.h +++ b/polly/include/polly/ScopDetectionDiagnostic.h @@ -20,15 +20,10 @@ #ifndef POLLY_SCOPDETECTIONDIAGNOSTIC_H #define POLLY_SCOPDETECTIONDIAGNOSTIC_H -#include "llvm/ADT/SmallVector.h" #include "llvm/Analysis/LoopInfo.h" #include "llvm/IR/DebugLoc.h" #include "llvm/IR/Instruction.h" #include <cstddef> -#include <memory> -#include <string> -#include <utility> -#include <vector> using namespace llvm; @@ -37,10 +32,8 @@ namespace llvm { class AliasSet; class BasicBlock; class OptimizationRemarkEmitter; -class raw_ostream; class Region; class SCEV; -class Value; } // namespace llvm namespace polly { diff --git a/polly/include/polly/ScopInfo.h b/polly/include/polly/ScopInfo.h index 98db37babfd..5f48f64dea0 100644 --- a/polly/include/polly/ScopInfo.h +++ b/polly/include/polly/ScopInfo.h @@ -19,75 +19,31 @@ #include "polly/ScopDetection.h" #include "polly/Support/SCEVAffinator.h" -#include "polly/Support/ScopHelper.h" #include "llvm/ADT/ArrayRef.h" -#include "llvm/ADT/DenseMap.h" -#include "llvm/ADT/DenseSet.h" #include "llvm/ADT/MapVector.h" -#include "llvm/ADT/Optional.h" #include "llvm/ADT/SetVector.h" -#include "llvm/ADT/SmallVector.h" -#include "llvm/ADT/StringMap.h" -#include "llvm/ADT/StringRef.h" -#include "llvm/ADT/iterator_range.h" #include "llvm/Analysis/RegionPass.h" -#include "llvm/Analysis/ScalarEvolutionExpressions.h" #include "llvm/IR/DebugLoc.h" #include "llvm/IR/Instruction.h" #include "llvm/IR/Instructions.h" -#include "llvm/IR/IntrinsicInst.h" #include "llvm/IR/PassManager.h" #include "llvm/IR/ValueHandle.h" #include "llvm/Pass.h" -#include "llvm/Support/Casting.h" #include "isl/isl-noexceptions.h" -#include <algorithm> #include <cassert> #include <cstddef> #include <forward_list> -#include <functional> -#include <list> -#include <map> -#include <memory> -#include <string> -#include <tuple> -#include <utility> -#include <vector> using namespace llvm; namespace llvm { - -class AssumptionCache; -class BasicBlock; -class DataLayout; -class DominatorTree; -class Function; -class Loop; -class LoopInfo; -class OptimizationRemarkEmitter; -class PassRegistry; -class raw_ostream; -class ScalarEvolution; -class SCEV; -class Type; -class Value; - void initializeScopInfoRegionPassPass(PassRegistry &); void initializeScopInfoWrapperPassPass(PassRegistry &); } // end namespace llvm -struct isl_map; -struct isl_pw_multi_aff; -struct isl_schedule; -struct isl_set; -struct isl_union_map; - namespace polly { class MemoryAccess; -class Scop; -class ScopStmt; //===---------------------------------------------------------------------===// diff --git a/polly/include/polly/Support/GICHelper.h b/polly/include/polly/Support/GICHelper.h index 5442c0897ae..ca8abe413fe 100644 --- a/polly/include/polly/Support/GICHelper.h +++ b/polly/include/polly/Support/GICHelper.h @@ -16,23 +16,9 @@ #include "llvm/ADT/APInt.h" #include "llvm/IR/DiagnosticInfo.h" #include "llvm/Support/raw_ostream.h" -#include "isl/aff.h" #include "isl/ctx.h" #include "isl/isl-noexceptions.h" -#include "isl/map.h" #include "isl/options.h" -#include "isl/set.h" -#include "isl/union_map.h" -#include "isl/union_set.h" -#include <functional> -#include <string> - -struct isl_schedule; -struct isl_multi_aff; - -namespace llvm { -class Value; -} // namespace llvm namespace polly { diff --git a/polly/include/polly/Support/ISLTools.h b/polly/include/polly/Support/ISLTools.h index 230145f813e..fab0dae8ad1 100644 --- a/polly/include/polly/Support/ISLTools.h +++ b/polly/include/polly/Support/ISLTools.h @@ -14,8 +14,8 @@ #ifndef POLLY_ISLTOOLS_H #define POLLY_ISLTOOLS_H -#include "polly/Support/GICHelper.h" -#include "llvm/ADT/iterator_range.h" +#include "llvm/ADT/iterator.h" +#include "isl/isl-noexceptions.h" namespace isl { inline namespace noexceptions { diff --git a/polly/include/polly/Support/SCEVAffinator.h b/polly/include/polly/Support/SCEVAffinator.h index c15ae56ab51..4aad9a6e679 100644 --- a/polly/include/polly/Support/SCEVAffinator.h +++ b/polly/include/polly/Support/SCEVAffinator.h @@ -13,21 +13,11 @@ #ifndef POLLY_SCEV_AFFINATOR_H #define POLLY_SCEV_AFFINATOR_H -#include "llvm/ADT/DenseMap.h" #include "llvm/Analysis/ScalarEvolutionExpressions.h" - #include "isl/isl-noexceptions.h" -namespace llvm { -class Region; -class BasicBlock; -class DataLayout; -class ScalarEvolution; -} // namespace llvm - namespace polly { class Scop; -class ScopStmt; /// The result type of the SCEVAffinator. /// diff --git a/polly/include/polly/Support/SCEVValidator.h b/polly/include/polly/Support/SCEVValidator.h index 23d40e8359e..a341dc08c4b 100644 --- a/polly/include/polly/Support/SCEVValidator.h +++ b/polly/include/polly/Support/SCEVValidator.h @@ -12,17 +12,9 @@ #define POLLY_SCEV_VALIDATOR_H #include "polly/Support/ScopHelper.h" -#include "llvm/ADT/SetVector.h" namespace llvm { -class Region; -class SCEV; class SCEVConstant; -class ScalarEvolution; -class Value; -class Loop; -class LoadInst; -class CallInst; } // namespace llvm namespace polly { diff --git a/polly/include/polly/Support/ScopHelper.h b/polly/include/polly/Support/ScopHelper.h index 0d26027ecce..02c669a1f3e 100644 --- a/polly/include/polly/Support/ScopHelper.h +++ b/polly/include/polly/Support/ScopHelper.h @@ -13,13 +13,10 @@ #ifndef POLLY_SUPPORT_IRHELPER_H #define POLLY_SUPPORT_IRHELPER_H -#include "llvm/ADT/DenseMap.h" #include "llvm/ADT/SetVector.h" #include "llvm/IR/Instructions.h" #include "llvm/IR/IntrinsicInst.h" #include "llvm/IR/ValueHandle.h" -#include <tuple> -#include <vector> namespace llvm { class LoopInfo; @@ -30,7 +27,6 @@ class Region; class Pass; class DominatorTree; class RegionInfo; -class GetElementPtrInst; } // namespace llvm namespace polly { diff --git a/polly/lib/Analysis/DependenceInfo.cpp b/polly/lib/Analysis/DependenceInfo.cpp index eaceaf06c32..173c292c81e 100644 --- a/polly/lib/Analysis/DependenceInfo.cpp +++ b/polly/lib/Analysis/DependenceInfo.cpp @@ -26,15 +26,14 @@ #include "polly/Support/GICHelper.h" #include "polly/Support/ISLTools.h" #include "llvm/Support/Debug.h" -#include <isl/aff.h> -#include <isl/ctx.h> -#include <isl/flow.h> -#include <isl/map.h> -#include <isl/options.h> -#include <isl/schedule.h> -#include <isl/set.h> -#include <isl/union_map.h> -#include <isl/union_set.h> +#include "isl/aff.h" +#include "isl/ctx.h" +#include "isl/flow.h" +#include "isl/map.h" +#include "isl/schedule.h" +#include "isl/set.h" +#include "isl/union_map.h" +#include "isl/union_set.h" using namespace polly; using namespace llvm; diff --git a/polly/lib/Analysis/PolyhedralInfo.cpp b/polly/lib/Analysis/PolyhedralInfo.cpp index d734d9ecd77..2b5ed6fc819 100644 --- a/polly/lib/Analysis/PolyhedralInfo.cpp +++ b/polly/lib/Analysis/PolyhedralInfo.cpp @@ -26,8 +26,7 @@ #include "polly/Support/GICHelper.h" #include "llvm/Analysis/LoopInfo.h" #include "llvm/Support/Debug.h" -#include <isl/map.h> -#include <isl/union_map.h> +#include "isl/union_map.h" using namespace llvm; using namespace polly; diff --git a/polly/lib/Analysis/PruneUnprofitable.cpp b/polly/lib/Analysis/PruneUnprofitable.cpp index 008c5f9e3b1..f2780a3e9f5 100644 --- a/polly/lib/Analysis/PruneUnprofitable.cpp +++ b/polly/lib/Analysis/PruneUnprofitable.cpp @@ -16,7 +16,6 @@ #include "polly/ScopPass.h" #include "llvm/ADT/Statistic.h" #include "llvm/IR/DebugLoc.h" -#include "llvm/Pass.h" #include "llvm/Support/Debug.h" #include "llvm/Support/raw_ostream.h" diff --git a/polly/lib/Analysis/ScopBuilder.cpp b/polly/lib/Analysis/ScopBuilder.cpp index 6b7e073c14c..3c44429a548 100644 --- a/polly/lib/Analysis/ScopBuilder.cpp +++ b/polly/lib/Analysis/ScopBuilder.cpp @@ -16,17 +16,13 @@ #include "polly/ScopBuilder.h" #include "polly/Options.h" #include "polly/ScopDetection.h" -#include "polly/ScopDetectionDiagnostic.h" #include "polly/ScopInfo.h" #include "polly/Support/GICHelper.h" #include "polly/Support/SCEVValidator.h" #include "polly/Support/ScopHelper.h" #include "polly/Support/VirtualInstruction.h" -#include "llvm/ADT/APInt.h" #include "llvm/ADT/ArrayRef.h" -#include "llvm/ADT/DenseMap.h" #include "llvm/ADT/EquivalenceClasses.h" -#include "llvm/ADT/SetVector.h" #include "llvm/ADT/Statistic.h" #include "llvm/Analysis/AliasAnalysis.h" #include "llvm/Analysis/LoopInfo.h" @@ -36,31 +32,23 @@ #include "llvm/Analysis/ScalarEvolution.h" #include "llvm/Analysis/ScalarEvolutionExpressions.h" #include "llvm/IR/BasicBlock.h" -#include "llvm/IR/Constants.h" #include "llvm/IR/DataLayout.h" #include "llvm/IR/DebugLoc.h" #include "llvm/IR/DerivedTypes.h" -#include "llvm/IR/DiagnosticInfo.h" #include "llvm/IR/Dominators.h" #include "llvm/IR/Function.h" #include "llvm/IR/InstrTypes.h" #include "llvm/IR/Instruction.h" #include "llvm/IR/Instructions.h" -#include "llvm/IR/IntrinsicInst.h" -#include "llvm/IR/Operator.h" #include "llvm/IR/Type.h" #include "llvm/IR/Use.h" #include "llvm/IR/Value.h" -#include "llvm/Support/Casting.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Compiler.h" #include "llvm/Support/Debug.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/raw_ostream.h" #include <cassert> -#include <string> -#include <tuple> -#include <vector> using namespace llvm; using namespace polly; diff --git a/polly/lib/Analysis/ScopDetection.cpp b/polly/lib/Analysis/ScopDetection.cpp index 905f37e8928..25732b7cbae 100644 --- a/polly/lib/Analysis/ScopDetection.cpp +++ b/polly/lib/Analysis/ScopDetection.cpp @@ -50,22 +50,16 @@ #include "polly/Support/SCEVValidator.h" #include "polly/Support/ScopHelper.h" #include "polly/Support/ScopLocation.h" -#include "llvm/ADT/DenseMap.h" -#include "llvm/ADT/SetVector.h" #include "llvm/ADT/SmallPtrSet.h" -#include "llvm/ADT/SmallVector.h" #include "llvm/ADT/Statistic.h" -#include "llvm/ADT/StringRef.h" #include "llvm/Analysis/AliasAnalysis.h" #include "llvm/Analysis/Loads.h" #include "llvm/Analysis/LoopInfo.h" -#include "llvm/Analysis/MemoryLocation.h" #include "llvm/Analysis/OptimizationRemarkEmitter.h" #include "llvm/Analysis/RegionInfo.h" #include "llvm/Analysis/ScalarEvolution.h" #include "llvm/Analysis/ScalarEvolutionExpressions.h" #include "llvm/IR/BasicBlock.h" -#include "llvm/IR/Constants.h" #include "llvm/IR/DebugLoc.h" #include "llvm/IR/DerivedTypes.h" #include "llvm/IR/DiagnosticInfo.h" @@ -76,27 +70,14 @@ #include "llvm/IR/Instruction.h" #include "llvm/IR/Instructions.h" #include "llvm/IR/IntrinsicInst.h" -#include "llvm/IR/Intrinsics.h" -#include "llvm/IR/LLVMContext.h" #include "llvm/IR/Metadata.h" #include "llvm/IR/Module.h" #include "llvm/IR/PassManager.h" -#include "llvm/IR/Type.h" #include "llvm/IR/Value.h" #include "llvm/Pass.h" -#include "llvm/Support/Casting.h" -#include "llvm/Support/CommandLine.h" #include "llvm/Support/Debug.h" -#include "llvm/Support/ErrorHandling.h" -#include "llvm/Support/Regex.h" #include "llvm/Support/raw_ostream.h" -#include <algorithm> #include <cassert> -#include <memory> -#include <stack> -#include <string> -#include <utility> -#include <vector> using namespace llvm; using namespace polly; diff --git a/polly/lib/Analysis/ScopInfo.cpp b/polly/lib/Analysis/ScopInfo.cpp index 30c759d9f51..f7e7898ee8b 100644 --- a/polly/lib/Analysis/ScopInfo.cpp +++ b/polly/lib/Analysis/ScopInfo.cpp @@ -29,19 +29,11 @@ #include "polly/Support/ScopHelper.h" #include "llvm/ADT/APInt.h" #include "llvm/ADT/ArrayRef.h" -#include "llvm/ADT/DenseMap.h" -#include "llvm/ADT/DenseSet.h" #include "llvm/ADT/PostOrderIterator.h" -#include "llvm/ADT/STLExtras.h" -#include "llvm/ADT/SetVector.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/SmallSet.h" -#include "llvm/ADT/SmallVector.h" #include "llvm/ADT/Statistic.h" -#include "llvm/ADT/StringExtras.h" -#include "llvm/ADT/StringMap.h" #include "llvm/Analysis/AliasAnalysis.h" -#include "llvm/Analysis/AliasSetTracker.h" #include "llvm/Analysis/AssumptionCache.h" #include "llvm/Analysis/Loads.h" #include "llvm/Analysis/LoopInfo.h" @@ -50,58 +42,29 @@ #include "llvm/Analysis/RegionIterator.h" #include "llvm/Analysis/ScalarEvolution.h" #include "llvm/Analysis/ScalarEvolutionExpressions.h" -#include "llvm/IR/Argument.h" #include "llvm/IR/BasicBlock.h" -#include "llvm/IR/CFG.h" #include "llvm/IR/ConstantRange.h" -#include "llvm/IR/Constants.h" #include "llvm/IR/DataLayout.h" #include "llvm/IR/DebugLoc.h" -#include "llvm/IR/DerivedTypes.h" -#include "llvm/IR/DiagnosticInfo.h" #include "llvm/IR/Dominators.h" #include "llvm/IR/Function.h" #include "llvm/IR/InstrTypes.h" #include "llvm/IR/Instruction.h" #include "llvm/IR/Instructions.h" -#include "llvm/IR/IntrinsicInst.h" #include "llvm/IR/Module.h" #include "llvm/IR/PassManager.h" #include "llvm/IR/Type.h" -#include "llvm/IR/Use.h" -#include "llvm/IR/User.h" #include "llvm/IR/Value.h" -#include "llvm/Pass.h" -#include "llvm/Support/Casting.h" -#include "llvm/Support/CommandLine.h" #include "llvm/Support/Compiler.h" #include "llvm/Support/Debug.h" #include "llvm/Support/ErrorHandling.h" -#include "llvm/Support/MathExtras.h" #include "llvm/Support/raw_ostream.h" #include "isl/aff.h" -#include "isl/constraint.h" #include "isl/local_space.h" #include "isl/map.h" #include "isl/options.h" -#include "isl/printer.h" -#include "isl/schedule.h" -#include "isl/schedule_node.h" #include "isl/set.h" -#include "isl/union_map.h" -#include "isl/union_set.h" -#include "isl/val.h" -#include <algorithm> #include <cassert> -#include <cstdlib> -#include <cstring> -#include <deque> -#include <iterator> -#include <memory> -#include <string> -#include <tuple> -#include <utility> -#include <vector> using namespace llvm; using namespace polly; diff --git a/polly/lib/Analysis/ScopPass.cpp b/polly/lib/Analysis/ScopPass.cpp index 5898286e569..6e29998024d 100644 --- a/polly/lib/Analysis/ScopPass.cpp +++ b/polly/lib/Analysis/ScopPass.cpp @@ -12,8 +12,6 @@ #include "polly/ScopPass.h" #include "polly/ScopInfo.h" - -#include "llvm/Analysis/AssumptionCache.h" #include "llvm/Analysis/BasicAliasAnalysis.h" #include "llvm/Analysis/GlobalsModRef.h" #include "llvm/Analysis/OptimizationRemarkEmitter.h" diff --git a/polly/lib/CodeGen/BlockGenerators.cpp b/polly/lib/CodeGen/BlockGenerators.cpp index 4990db8795d..389c8acb7df 100644 --- a/polly/lib/CodeGen/BlockGenerators.cpp +++ b/polly/lib/CodeGen/BlockGenerators.cpp @@ -13,26 +13,18 @@ //===----------------------------------------------------------------------===// #include "polly/CodeGen/BlockGenerators.h" -#include "polly/CodeGen/CodeGeneration.h" #include "polly/CodeGen/IslExprBuilder.h" #include "polly/CodeGen/RuntimeDebugBuilder.h" #include "polly/Options.h" #include "polly/ScopInfo.h" -#include "polly/Support/GICHelper.h" -#include "polly/Support/SCEVValidator.h" #include "polly/Support/ScopHelper.h" #include "polly/Support/VirtualInstruction.h" #include "llvm/Analysis/LoopInfo.h" #include "llvm/Analysis/RegionInfo.h" #include "llvm/Analysis/ScalarEvolution.h" -#include "llvm/IR/IntrinsicInst.h" -#include "llvm/IR/Module.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" #include "llvm/Transforms/Utils/Local.h" -#include "isl/aff.h" #include "isl/ast.h" -#include "isl/ast_build.h" -#include "isl/set.h" #include <deque> using namespace llvm; diff --git a/polly/lib/CodeGen/CodeGeneration.cpp b/polly/lib/CodeGen/CodeGeneration.cpp index af6a8db95c8..784b7d83abb 100644 --- a/polly/lib/CodeGen/CodeGeneration.cpp +++ b/polly/lib/CodeGen/CodeGeneration.cpp @@ -27,34 +27,21 @@ #include "polly/DependenceInfo.h" #include "polly/LinkAllPasses.h" #include "polly/Options.h" -#include "polly/ScopDetectionDiagnostic.h" #include "polly/ScopInfo.h" #include "polly/Support/ScopHelper.h" #include "llvm/ADT/Statistic.h" -#include "llvm/Analysis/AliasAnalysis.h" -#include "llvm/Analysis/BasicAliasAnalysis.h" -#include "llvm/Analysis/GlobalsModRef.h" #include "llvm/Analysis/LoopInfo.h" #include "llvm/Analysis/RegionInfo.h" -#include "llvm/Analysis/ScalarEvolutionAliasAnalysis.h" #include "llvm/IR/BasicBlock.h" #include "llvm/IR/Dominators.h" #include "llvm/IR/Function.h" -#include "llvm/IR/Instruction.h" -#include "llvm/IR/IntrinsicInst.h" -#include "llvm/IR/Intrinsics.h" -#include "llvm/IR/Module.h" #include "llvm/IR/PassManager.h" #include "llvm/IR/Verifier.h" -#include "llvm/Pass.h" -#include "llvm/Support/Casting.h" -#include "llvm/Support/CommandLine.h" #include "llvm/Support/Debug.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/raw_ostream.h" #include "isl/ast.h" #include <cassert> -#include <utility> using namespace llvm; using namespace polly; diff --git a/polly/lib/CodeGen/CodegenCleanup.cpp b/polly/lib/CodeGen/CodegenCleanup.cpp index 885bd9dd813..b1cf935ffe1 100644 --- a/polly/lib/CodeGen/CodegenCleanup.cpp +++ b/polly/lib/CodeGen/CodegenCleanup.cpp @@ -12,8 +12,6 @@ #include "llvm/Analysis/TypeBasedAliasAnalysis.h" #include "llvm/IR/Function.h" #include "llvm/IR/LegacyPassManager.h" -#include "llvm/PassInfo.h" -#include "llvm/PassRegistry.h" #include "llvm/PassSupport.h" #include "llvm/Support/Debug.h" #include "llvm/Transforms/InstCombine/InstCombine.h" diff --git a/polly/lib/CodeGen/IRBuilder.cpp b/polly/lib/CodeGen/IRBuilder.cpp index f93cf21f99b..435be74cb7e 100644 --- a/polly/lib/CodeGen/IRBuilder.cpp +++ b/polly/lib/CodeGen/IRBuilder.cpp @@ -16,7 +16,6 @@ #include "polly/Support/ScopHelper.h" #include "llvm/ADT/SmallVector.h" #include "llvm/IR/Metadata.h" -#include "llvm/Support/Debug.h" using namespace llvm; using namespace polly; diff --git a/polly/lib/CodeGen/IslAst.cpp b/polly/lib/CodeGen/IslAst.cpp index b2285475d38..8ccbeda6a73 100644 --- a/polly/lib/CodeGen/IslAst.cpp +++ b/polly/lib/CodeGen/IslAst.cpp @@ -37,8 +37,6 @@ #include "polly/Support/GICHelper.h" #include "llvm/ADT/Statistic.h" #include "llvm/IR/Function.h" -#include "llvm/Pass.h" -#include "llvm/Support/CommandLine.h" #include "llvm/Support/Debug.h" #include "llvm/Support/raw_ostream.h" #include "isl/aff.h" @@ -46,7 +44,6 @@ #include "isl/ast_build.h" #include "isl/id.h" #include "isl/isl-noexceptions.h" -#include "isl/map.h" #include "isl/printer.h" #include "isl/schedule.h" #include "isl/set.h" @@ -54,10 +51,6 @@ #include "isl/val.h" #include <cassert> #include <cstdlib> -#include <cstring> -#include <map> -#include <string> -#include <utility> #define DEBUG_TYPE "polly-ast" diff --git a/polly/lib/CodeGen/IslExprBuilder.cpp b/polly/lib/CodeGen/IslExprBuilder.cpp index 51b507a0a24..c8e2984b1dc 100644 --- a/polly/lib/CodeGen/IslExprBuilder.cpp +++ b/polly/lib/CodeGen/IslExprBuilder.cpp @@ -13,8 +13,6 @@ #include "polly/Options.h" #include "polly/ScopInfo.h" #include "polly/Support/GICHelper.h" -#include "polly/Support/ScopHelper.h" -#include "llvm/Support/Debug.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" using namespace llvm; diff --git a/polly/lib/CodeGen/IslNodeBuilder.cpp b/polly/lib/CodeGen/IslNodeBuilder.cpp index 06a646fe87f..492944cf7c3 100644 --- a/polly/lib/CodeGen/IslNodeBuilder.cpp +++ b/polly/lib/CodeGen/IslNodeBuilder.cpp @@ -19,10 +19,8 @@ #include "polly/CodeGen/LoopGeneratorsGOMP.h" #include "polly/CodeGen/LoopGeneratorsKMP.h" #include "polly/CodeGen/RuntimeDebugBuilder.h" -#include "polly/Config/config.h" #include "polly/Options.h" #include "polly/ScopInfo.h" -#include "polly/Support/GICHelper.h" #include "polly/Support/ISLTools.h" #include "polly/Support/SCEVValidator.h" #include "polly/Support/ScopHelper.h" diff --git a/polly/lib/CodeGen/LoopGeneratorsGOMP.cpp b/polly/lib/CodeGen/LoopGeneratorsGOMP.cpp index 0a16a87c84b..9c93af924ac 100644 --- a/polly/lib/CodeGen/LoopGeneratorsGOMP.cpp +++ b/polly/lib/CodeGen/LoopGeneratorsGOMP.cpp @@ -11,13 +11,8 @@ //===----------------------------------------------------------------------===// #include "polly/CodeGen/LoopGeneratorsGOMP.h" -#include "polly/ScopDetection.h" -#include "llvm/Analysis/LoopInfo.h" -#include "llvm/IR/DataLayout.h" #include "llvm/IR/Dominators.h" #include "llvm/IR/Module.h" -#include "llvm/Support/CommandLine.h" -#include "llvm/Transforms/Utils/BasicBlockUtils.h" using namespace llvm; using namespace polly; diff --git a/polly/lib/CodeGen/LoopGeneratorsKMP.cpp b/polly/lib/CodeGen/LoopGeneratorsKMP.cpp index 653b211fa62..d2ebdbce619 100644 --- a/polly/lib/CodeGen/LoopGeneratorsKMP.cpp +++ b/polly/lib/CodeGen/LoopGeneratorsKMP.cpp @@ -11,14 +11,8 @@ //===----------------------------------------------------------------------===// #include "polly/CodeGen/LoopGeneratorsKMP.h" -#include "polly/Options.h" -#include "polly/ScopDetection.h" -#include "llvm/Analysis/LoopInfo.h" -#include "llvm/IR/DataLayout.h" #include "llvm/IR/Dominators.h" #include "llvm/IR/Module.h" -#include "llvm/Support/CommandLine.h" -#include "llvm/Transforms/Utils/BasicBlockUtils.h" using namespace llvm; using namespace polly; diff --git a/polly/lib/CodeGen/ManagedMemoryRewrite.cpp b/polly/lib/CodeGen/ManagedMemoryRewrite.cpp index 8065eb8c4bd..8492b5f339b 100644 --- a/polly/lib/CodeGen/ManagedMemoryRewrite.cpp +++ b/polly/lib/CodeGen/ManagedMemoryRewrite.cpp @@ -15,35 +15,18 @@ // //===----------------------------------------------------------------------===// -#include "polly/CodeGen/CodeGeneration.h" -#include "polly/CodeGen/IslAst.h" -#include "polly/CodeGen/IslNodeBuilder.h" +#include "polly/CodeGen/IRBuilder.h" #include "polly/CodeGen/PPCGCodeGeneration.h" -#include "polly/CodeGen/Utils.h" #include "polly/DependenceInfo.h" #include "polly/LinkAllPasses.h" #include "polly/Options.h" #include "polly/ScopDetection.h" -#include "polly/ScopInfo.h" -#include "polly/Support/SCEVValidator.h" -#include "llvm/Analysis/AliasAnalysis.h" -#include "llvm/Analysis/BasicAliasAnalysis.h" +#include "llvm/ADT/SmallSet.h" #include "llvm/Analysis/CaptureTracking.h" -#include "llvm/Analysis/GlobalsModRef.h" -#include "llvm/Analysis/ScalarEvolutionAliasAnalysis.h" -#include "llvm/Analysis/TargetLibraryInfo.h" -#include "llvm/Analysis/TargetTransformInfo.h" -#include "llvm/IR/LegacyPassManager.h" -#include "llvm/IR/Verifier.h" -#include "llvm/IRReader/IRReader.h" -#include "llvm/Linker/Linker.h" -#include "llvm/Support/TargetRegistry.h" -#include "llvm/Support/TargetSelect.h" -#include "llvm/Target/TargetMachine.h" -#include "llvm/Transforms/IPO/PassManagerBuilder.h" -#include "llvm/Transforms/Utils/BasicBlockUtils.h" #include "llvm/Transforms/Utils/ModuleUtils.h" +using namespace polly; + static cl::opt<bool> RewriteAllocas( "polly-acc-rewrite-allocas", cl::desc( diff --git a/polly/lib/CodeGen/PPCGCodeGeneration.cpp b/polly/lib/CodeGen/PPCGCodeGeneration.cpp index 2ed60b26716..2516b33a0ca 100644 --- a/polly/lib/CodeGen/PPCGCodeGeneration.cpp +++ b/polly/lib/CodeGen/PPCGCodeGeneration.cpp @@ -24,30 +24,22 @@ #include "polly/ScopInfo.h" #include "polly/Support/SCEVValidator.h" #include "llvm/ADT/PostOrderIterator.h" -#include "llvm/Analysis/AliasAnalysis.h" -#include "llvm/Analysis/BasicAliasAnalysis.h" -#include "llvm/Analysis/GlobalsModRef.h" -#include "llvm/Analysis/ScalarEvolutionAliasAnalysis.h" -#include "llvm/Analysis/TargetLibraryInfo.h" #include "llvm/Analysis/TargetTransformInfo.h" #include "llvm/IR/LegacyPassManager.h" #include "llvm/IR/Verifier.h" #include "llvm/IRReader/IRReader.h" #include "llvm/Linker/Linker.h" +#include "llvm/Support/SourceMgr.h" #include "llvm/Support/TargetRegistry.h" -#include "llvm/Support/TargetSelect.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Transforms/IPO/PassManagerBuilder.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" - #include "isl/union_map.h" extern "C" { #include "ppcg/cuda.h" #include "ppcg/gpu.h" -#include "ppcg/gpu_print.h" #include "ppcg/ppcg.h" -#include "ppcg/schedule.h" } #include "llvm/Support/Debug.h" diff --git a/polly/lib/CodeGen/RuntimeDebugBuilder.cpp b/polly/lib/CodeGen/RuntimeDebugBuilder.cpp index 847c4a0c774..29cba08f113 100644 --- a/polly/lib/CodeGen/RuntimeDebugBuilder.cpp +++ b/polly/lib/CodeGen/RuntimeDebugBuilder.cpp @@ -11,7 +11,6 @@ #include "polly/CodeGen/RuntimeDebugBuilder.h" #include "llvm/IR/Intrinsics.h" #include "llvm/IR/Module.h" -#include "llvm/Support/Debug.h" #include <string> #include <vector> diff --git a/polly/lib/CodeGen/Utils.cpp b/polly/lib/CodeGen/Utils.cpp index 96f8c057bbc..3afb2e58088 100644 --- a/polly/lib/CodeGen/Utils.cpp +++ b/polly/lib/CodeGen/Utils.cpp @@ -15,7 +15,6 @@ #include "polly/ScopInfo.h" #include "llvm/Analysis/LoopInfo.h" #include "llvm/Analysis/RegionInfo.h" -#include "llvm/Support/Debug.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" using namespace llvm; diff --git a/polly/lib/Exchange/JSONExporter.cpp b/polly/lib/Exchange/JSONExporter.cpp index c7c9b9509b0..b9cb568ff64 100644 --- a/polly/lib/Exchange/JSONExporter.cpp +++ b/polly/lib/Exchange/JSONExporter.cpp @@ -18,18 +18,14 @@ #include "polly/ScopPass.h" #include "polly/Support/ScopLocation.h" #include "llvm/ADT/Statistic.h" -#include "llvm/Analysis/RegionInfo.h" #include "llvm/IR/Module.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/JSON.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/ToolOutputFile.h" #include "llvm/Support/raw_ostream.h" -#include "isl/constraint.h" #include "isl/map.h" -#include "isl/printer.h" #include "isl/set.h" -#include "isl/union_map.h" #include <memory> #include <string> #include <system_error> diff --git a/polly/lib/Polly.cpp b/polly/lib/Polly.cpp index 6c539e99cee..e6bae931fc5 100644 --- a/polly/lib/Polly.cpp +++ b/polly/lib/Polly.cpp @@ -9,7 +9,7 @@ //===----------------------------------------------------------------------===// #include "polly/RegisterPasses.h" -#include "llvm/Transforms/IPO/PassManagerBuilder.h" +#include "llvm/PassRegistry.h" namespace { diff --git a/polly/lib/Support/DumpModulePass.cpp b/polly/lib/Support/DumpModulePass.cpp index 7a812b48981..615fd75b97e 100644 --- a/polly/lib/Support/DumpModulePass.cpp +++ b/polly/lib/Support/DumpModulePass.cpp @@ -11,16 +11,13 @@ //===----------------------------------------------------------------------===// #include "polly/Support/DumpModulePass.h" - -#include "polly/Options.h" -#include "llvm/IR/LegacyPassManagers.h" #include "llvm/IR/Module.h" #include "llvm/Pass.h" #include "llvm/Support/Debug.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/Path.h" #include "llvm/Support/ToolOutputFile.h" -#include <string.h> + #define DEBUG_TYPE "polly-dump-module" using namespace llvm; diff --git a/polly/lib/Support/GICHelper.cpp b/polly/lib/Support/GICHelper.cpp index 24956929fb2..1230b4827a2 100644 --- a/polly/lib/Support/GICHelper.cpp +++ b/polly/lib/Support/GICHelper.cpp @@ -9,19 +9,11 @@ // Functions for converting between gmp objects and llvm::APInt. // //===----------------------------------------------------------------------===// + #include "polly/Support/GICHelper.h" -#include "llvm/IR/Value.h" -#include "isl/aff.h" -#include "isl/map.h" -#include "isl/schedule.h" -#include "isl/set.h" -#include "isl/space.h" -#include "isl/union_map.h" -#include "isl/union_set.h" +#include "llvm/ADT/APInt.h" #include "isl/val.h" -#include <climits> - using namespace llvm; __isl_give isl_val *polly::isl_valFromAPInt(isl_ctx *Ctx, const APInt Int, diff --git a/polly/lib/Support/ISLTools.cpp b/polly/lib/Support/ISLTools.cpp index f7a5c10fbf6..25592624aca 100644 --- a/polly/lib/Support/ISLTools.cpp +++ b/polly/lib/Support/ISLTools.cpp @@ -12,7 +12,9 @@ //===----------------------------------------------------------------------===// #include "polly/Support/ISLTools.h" -#include "llvm/ADT/StringRef.h" +#include "llvm/Support/raw_ostream.h" +#include <cassert> +#include <vector> using namespace polly; diff --git a/polly/lib/Support/RegisterPasses.cpp b/polly/lib/Support/RegisterPasses.cpp index 676756d2490..1349bdc261a 100644 --- a/polly/lib/Support/RegisterPasses.cpp +++ b/polly/lib/Support/RegisterPasses.cpp @@ -23,15 +23,11 @@ #include "polly/CodeGen/CodeGeneration.h" #include "polly/CodeGen/CodegenCleanup.h" #include "polly/CodeGen/IslAst.h" -#include "polly/CodeGen/PPCGCodeGeneration.h" #include "polly/CodePreparation.h" -#include "polly/DeLICM.h" #include "polly/DependenceInfo.h" -#include "polly/FlattenSchedule.h" #include "polly/ForwardOpTree.h" #include "polly/JSONExporter.h" #include "polly/LinkAllPasses.h" -#include "polly/Options.h" #include "polly/PolyhedralInfo.h" #include "polly/ScopDetection.h" #include "polly/ScopInfo.h" @@ -45,8 +41,6 @@ #include "llvm/Support/TargetSelect.h" #include "llvm/Transforms/IPO.h" #include "llvm/Transforms/IPO/PassManagerBuilder.h" -#include "llvm/Transforms/Scalar.h" -#include "llvm/Transforms/Vectorize.h" using namespace llvm; using namespace polly; diff --git a/polly/lib/Support/SCEVAffinator.cpp b/polly/lib/Support/SCEVAffinator.cpp index c49204adf23..85e39e3d5b9 100644 --- a/polly/lib/Support/SCEVAffinator.cpp +++ b/polly/lib/Support/SCEVAffinator.cpp @@ -15,7 +15,6 @@ #include "polly/ScopInfo.h" #include "polly/Support/GICHelper.h" #include "polly/Support/SCEVValidator.h" -#include "polly/Support/ScopHelper.h" #include "isl/aff.h" #include "isl/local_space.h" #include "isl/set.h" diff --git a/polly/lib/Support/SCEVValidator.cpp b/polly/lib/Support/SCEVValidator.cpp index 6732f4b9ae0..84e9b87a328 100644 --- a/polly/lib/Support/SCEVValidator.cpp +++ b/polly/lib/Support/SCEVValidator.cpp @@ -1,6 +1,6 @@ #include "polly/Support/SCEVValidator.h" -#include "polly/ScopInfo.h" +#include "polly/ScopDetection.h" #include "llvm/Analysis/RegionInfo.h" #include "llvm/Analysis/ScalarEvolution.h" #include "llvm/Analysis/ScalarEvolutionExpressions.h" diff --git a/polly/lib/Support/ScopHelper.cpp b/polly/lib/Support/ScopHelper.cpp index aeeddfe8745..8c730c4c40f 100644 --- a/polly/lib/Support/ScopHelper.cpp +++ b/polly/lib/Support/ScopHelper.cpp @@ -16,13 +16,9 @@ #include "polly/Support/SCEVValidator.h" #include "llvm/Analysis/LoopInfo.h" #include "llvm/Analysis/RegionInfo.h" -#include "llvm/Analysis/RegionInfoImpl.h" #include "llvm/Analysis/ScalarEvolution.h" #include "llvm/Analysis/ScalarEvolutionExpander.h" #include "llvm/Analysis/ScalarEvolutionExpressions.h" -#include "llvm/IR/CFG.h" -#include "llvm/IR/IntrinsicInst.h" -#include "llvm/Support/Debug.h" #include "llvm/Transforms/Utils/BasicBlockUtils.h" using namespace llvm; diff --git a/polly/lib/Support/ScopLocation.cpp b/polly/lib/Support/ScopLocation.cpp index 3f8caf5e62b..1b5e82ea6da 100644 --- a/polly/lib/Support/ScopLocation.cpp +++ b/polly/lib/Support/ScopLocation.cpp @@ -12,9 +12,7 @@ // #include "polly/Support/ScopLocation.h" #include "llvm/Analysis/RegionInfo.h" -#include "llvm/IR/BasicBlock.h" -#include "llvm/IR/DebugInfo.h" -#include "llvm/IR/DebugLoc.h" +#include "llvm/IR/DebugInfoMetadata.h" using namespace llvm; diff --git a/polly/lib/Support/VirtualInstruction.cpp b/polly/lib/Support/VirtualInstruction.cpp index 7d8697d846f..be055acc4fa 100644 --- a/polly/lib/Support/VirtualInstruction.cpp +++ b/polly/lib/Support/VirtualInstruction.cpp @@ -12,7 +12,6 @@ //===----------------------------------------------------------------------===// #include "polly/Support/VirtualInstruction.h" -#include "polly/Support/SCEVValidator.h" using namespace polly; using namespace llvm; diff --git a/polly/lib/Transform/Canonicalization.cpp b/polly/lib/Transform/Canonicalization.cpp index 31e33407379..8945f1f6b86 100644 --- a/polly/lib/Transform/Canonicalization.cpp +++ b/polly/lib/Transform/Canonicalization.cpp @@ -15,6 +15,7 @@ #include "polly/Canonicalization.h" #include "polly/LinkAllPasses.h" #include "polly/Options.h" +#include "llvm/IR/LegacyPassManager.h" #include "llvm/Transforms/IPO.h" #include "llvm/Transforms/InstCombine/InstCombine.h" #include "llvm/Transforms/Scalar.h" diff --git a/polly/lib/Transform/CodePreparation.cpp b/polly/lib/Transform/CodePreparation.cpp index 1fb94734f53..a445d72c52b 100644 --- a/polly/lib/Transform/CodePreparation.cpp +++ b/polly/lib/Transform/CodePreparation.cpp @@ -17,13 +17,11 @@ #include "polly/CodePreparation.h" #include "polly/LinkAllPasses.h" -#include "polly/ScopDetection.h" #include "polly/Support/ScopHelper.h" #include "llvm/Analysis/DominanceFrontier.h" #include "llvm/Analysis/LoopInfo.h" #include "llvm/Analysis/RegionInfo.h" #include "llvm/Analysis/ScalarEvolution.h" -#include "llvm/Transforms/Utils/Local.h" using namespace llvm; using namespace polly; diff --git a/polly/lib/Transform/DeLICM.cpp b/polly/lib/Transform/DeLICM.cpp index ebebc60e206..b229d6008e2 100644 --- a/polly/lib/Transform/DeLICM.cpp +++ b/polly/lib/Transform/DeLICM.cpp @@ -15,13 +15,16 @@ //===----------------------------------------------------------------------===// #include "polly/DeLICM.h" +#include "polly/LinkAllPasses.h" #include "polly/Options.h" #include "polly/ScopInfo.h" #include "polly/ScopPass.h" +#include "polly/Support/GICHelper.h" #include "polly/Support/ISLOStream.h" #include "polly/Support/ISLTools.h" #include "polly/ZoneAlgo.h" #include "llvm/ADT/Statistic.h" + #define DEBUG_TYPE "polly-delicm" using namespace polly; diff --git a/polly/lib/Transform/DeadCodeElimination.cpp b/polly/lib/Transform/DeadCodeElimination.cpp index 7a7fcade241..cc8923c2547 100644 --- a/polly/lib/Transform/DeadCodeElimination.cpp +++ b/polly/lib/Transform/DeadCodeElimination.cpp @@ -36,12 +36,7 @@ #include "polly/Options.h" #include "polly/ScopInfo.h" #include "llvm/Support/CommandLine.h" -#include "isl/flow.h" #include "isl/isl-noexceptions.h" -#include "isl/map.h" -#include "isl/set.h" -#include "isl/union_map.h" -#include "isl/union_set.h" using namespace llvm; using namespace polly; diff --git a/polly/lib/Transform/ForwardOpTree.cpp b/polly/lib/Transform/ForwardOpTree.cpp index 4aa4d42dc8b..ad31673c5b3 100644 --- a/polly/lib/Transform/ForwardOpTree.cpp +++ b/polly/lib/Transform/ForwardOpTree.cpp @@ -28,7 +28,6 @@ #include "llvm/IR/Instruction.h" #include "llvm/IR/Instructions.h" #include "llvm/IR/Value.h" -#include "llvm/Pass.h" #include "llvm/Support/Casting.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Compiler.h" diff --git a/polly/lib/Transform/MaximalStaticExpansion.cpp b/polly/lib/Transform/MaximalStaticExpansion.cpp index 7fcd02286f9..a9e1c506acb 100644 --- a/polly/lib/Transform/MaximalStaticExpansion.cpp +++ b/polly/lib/Transform/MaximalStaticExpansion.cpp @@ -15,12 +15,10 @@ #include "polly/LinkAllPasses.h" #include "polly/ScopInfo.h" #include "polly/ScopPass.h" -#include "polly/Support/GICHelper.h" #include "polly/Support/ISLTools.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/StringRef.h" #include "llvm/Analysis/OptimizationRemarkEmitter.h" -#include "llvm/Pass.h" #include "isl/isl-noexceptions.h" #include "isl/union_map.h" #include <cassert> diff --git a/polly/lib/Transform/RewriteByReferenceParameters.cpp b/polly/lib/Transform/RewriteByReferenceParameters.cpp index 16cf56a26e8..494280e3c83 100644 --- a/polly/lib/Transform/RewriteByReferenceParameters.cpp +++ b/polly/lib/Transform/RewriteByReferenceParameters.cpp @@ -16,7 +16,7 @@ #include "polly/LinkAllPasses.h" #include "llvm/IR/Instruction.h" #include "llvm/IR/Instructions.h" -#include "llvm/IR/PassManager.h" +#include "llvm/Pass.h" #define DEBUG_TYPE "polly-rewrite-byref-params" diff --git a/polly/lib/Transform/ScheduleOptimizer.cpp b/polly/lib/Transform/ScheduleOptimizer.cpp index fbcfcec9d55..5554154924c 100644 --- a/polly/lib/Transform/ScheduleOptimizer.cpp +++ b/polly/lib/Transform/ScheduleOptimizer.cpp @@ -53,23 +53,18 @@ #include "polly/ScopInfo.h" #include "polly/ScopPass.h" #include "polly/Simplify.h" -#include "polly/Support/GICHelper.h" #include "polly/Support/ISLOStream.h" #include "llvm/ADT/Statistic.h" #include "llvm/Analysis/TargetTransformInfo.h" #include "llvm/IR/Function.h" -#include "llvm/Pass.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Debug.h" #include "llvm/Support/raw_ostream.h" -#include "isl/constraint.h" #include "isl/ctx.h" -#include "isl/map.h" #include "isl/options.h" #include "isl/printer.h" #include "isl/schedule.h" #include "isl/schedule_node.h" -#include "isl/space.h" #include "isl/union_map.h" #include "isl/union_set.h" #include <algorithm> diff --git a/polly/lib/Transform/ScopInliner.cpp b/polly/lib/Transform/ScopInliner.cpp index 76e43bdaaef..7aaa367774e 100644 --- a/polly/lib/Transform/ScopInliner.cpp +++ b/polly/lib/Transform/ScopInliner.cpp @@ -14,10 +14,8 @@ //===----------------------------------------------------------------------===// #include "polly/LinkAllPasses.h" -#include "polly/RegisterPasses.h" #include "polly/ScopDetection.h" #include "llvm/Analysis/CallGraphSCCPass.h" -#include "llvm/IR/LLVMContext.h" #include "llvm/IR/PassManager.h" #include "llvm/Passes/PassBuilder.h" #include "llvm/Transforms/IPO/AlwaysInliner.h" |
