summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--polly/include/polly/CodeGen/BlockGenerators.h2
-rw-r--r--polly/include/polly/CodeGen/CodeGeneration.h3
-rw-r--r--polly/include/polly/CodeGen/IRBuilder.h2
-rw-r--r--polly/include/polly/CodeGen/IslAst.h1
-rw-r--r--polly/include/polly/CodeGen/IslExprBuilder.h2
-rw-r--r--polly/include/polly/CodeGen/IslNodeBuilder.h6
-rw-r--r--polly/include/polly/CodeGen/LoopGenerators.h3
-rw-r--r--polly/include/polly/CodeGen/RuntimeDebugBuilder.h1
-rw-r--r--polly/include/polly/DependenceInfo.h1
-rw-r--r--polly/include/polly/ScopDetection.h10
-rw-r--r--polly/include/polly/ScopDetectionDiagnostic.h11
-rw-r--r--polly/include/polly/ScopInfo.h4
-rw-r--r--polly/include/polly/Support/GICHelper.h3
-rw-r--r--polly/include/polly/TempScopInfo.h1
-rw-r--r--polly/lib/Analysis/DependenceInfo.cpp3
-rw-r--r--polly/lib/Analysis/ScopDetection.cpp6
-rw-r--r--polly/lib/Analysis/ScopDetectionDiagnostic.cpp10
-rw-r--r--polly/lib/Analysis/ScopInfo.cpp18
-rw-r--r--polly/lib/Analysis/TempScopInfo.cpp4
-rw-r--r--polly/lib/CodeGen/BlockGenerators.cpp6
-rw-r--r--polly/lib/CodeGen/IRBuilder.cpp2
-rw-r--r--polly/lib/CodeGen/IslAst.cpp10
-rw-r--r--polly/lib/CodeGen/IslCodeGeneration.cpp3
-rw-r--r--polly/lib/CodeGen/IslExprBuilder.cpp2
-rw-r--r--polly/lib/CodeGen/IslNodeBuilder.cpp20
-rw-r--r--polly/lib/CodeGen/LoopGenerators.cpp2
-rw-r--r--polly/lib/CodeGen/RuntimeDebugBuilder.cpp1
-rw-r--r--polly/lib/CodeGen/Utils.cpp1
-rw-r--r--polly/lib/Exchange/JSONExporter.cpp12
-rw-r--r--polly/lib/Support/SCEVValidator.cpp3
-rw-r--r--polly/lib/Support/ScopLocation.cpp3
-rw-r--r--polly/lib/Transform/CodePreparation.cpp2
-rw-r--r--polly/lib/Transform/DeadCodeElimination.cpp2
-rw-r--r--polly/lib/Transform/IndependentBlocks.cpp5
-rw-r--r--polly/lib/Transform/ScheduleOptimizer.cpp14
35 files changed, 66 insertions, 113 deletions
diff --git a/polly/include/polly/CodeGen/BlockGenerators.h b/polly/include/polly/CodeGen/BlockGenerators.h
index 5929ca1f605..67b8c099dea 100644
--- a/polly/include/polly/CodeGen/BlockGenerators.h
+++ b/polly/include/polly/CodeGen/BlockGenerators.h
@@ -19,9 +19,7 @@
#include "polly/CodeGen/IRBuilder.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/Analysis/ScalarEvolutionExpressions.h"
-
#include "isl/map.h"
-
#include <vector>
struct isl_ast_build;
diff --git a/polly/include/polly/CodeGen/CodeGeneration.h b/polly/include/polly/CodeGen/CodeGeneration.h
index 1788b07cfca..03dc869c2e7 100644
--- a/polly/include/polly/CodeGen/CodeGeneration.h
+++ b/polly/include/polly/CodeGen/CodeGeneration.h
@@ -13,9 +13,8 @@
#define POLLY_CODEGENERATION_H
#include "polly/Config/config.h"
-
-#include "isl/set.h"
#include "isl/map.h"
+#include "isl/set.h"
namespace polly {
enum VectorizerChoice {
diff --git a/polly/include/polly/CodeGen/IRBuilder.h b/polly/include/polly/CodeGen/IRBuilder.h
index fb56d8a1d18..b4873e363a0 100644
--- a/polly/include/polly/CodeGen/IRBuilder.h
+++ b/polly/include/polly/CodeGen/IRBuilder.h
@@ -15,8 +15,8 @@
#ifndef POLLY_CODEGEN_IRBUILDER_H
#define POLLY_CODEGEN_IRBUILDER_H
-#include "llvm/IR/IRBuilder.h"
#include "llvm/Analysis/LoopInfo.h"
+#include "llvm/IR/IRBuilder.h"
namespace llvm {
class ScalarEvolution;
diff --git a/polly/include/polly/CodeGen/IslAst.h b/polly/include/polly/CodeGen/IslAst.h
index 530e0b6c9e6..4d6856931af 100644
--- a/polly/include/polly/CodeGen/IslAst.h
+++ b/polly/include/polly/CodeGen/IslAst.h
@@ -24,7 +24,6 @@
#include "polly/Config/config.h"
#include "polly/ScopPass.h"
-
#include "isl/ast.h"
namespace llvm {
diff --git a/polly/include/polly/CodeGen/IslExprBuilder.h b/polly/include/polly/CodeGen/IslExprBuilder.h
index 99e6d8b09fe..24fa4e42e7f 100644
--- a/polly/include/polly/CodeGen/IslExprBuilder.h
+++ b/polly/include/polly/CodeGen/IslExprBuilder.h
@@ -13,9 +13,7 @@
#define POLLY_ISL_EXPR_BUILDER_H
#include "polly/CodeGen/IRBuilder.h"
-
#include "llvm/ADT/MapVector.h"
-
#include "isl/ast.h"
namespace llvm {
diff --git a/polly/include/polly/CodeGen/IslNodeBuilder.h b/polly/include/polly/CodeGen/IslNodeBuilder.h
index 102f0069b8a..c0ef2cf0e2a 100644
--- a/polly/include/polly/CodeGen/IslNodeBuilder.h
+++ b/polly/include/polly/CodeGen/IslNodeBuilder.h
@@ -13,13 +13,11 @@
#ifndef POLLY_ISL_NODE_BUILDER_H
#define POLLY_ISL_NODE_BUILDER_H
-#include "polly/CodeGen/IslExprBuilder.h"
#include "polly/CodeGen/BlockGenerators.h"
+#include "polly/CodeGen/IslExprBuilder.h"
#include "polly/CodeGen/LoopGenerators.h"
-
-#include "isl/ctx.h"
-
#include "llvm/Analysis/ScalarEvolutionExpander.h"
+#include "isl/ctx.h"
using namespace polly;
using namespace llvm;
diff --git a/polly/include/polly/CodeGen/LoopGenerators.h b/polly/include/polly/CodeGen/LoopGenerators.h
index 78dc76dea75..f9e57b268c6 100644
--- a/polly/include/polly/CodeGen/LoopGenerators.h
+++ b/polly/include/polly/CodeGen/LoopGenerators.h
@@ -15,9 +15,8 @@
#define POLLY_LOOP_GENERATORS_H
#include "polly/CodeGen/IRBuilder.h"
-
-#include "llvm/IR/ValueMap.h"
#include "llvm/ADT/SetVector.h"
+#include "llvm/IR/ValueMap.h"
namespace llvm {
class Value;
diff --git a/polly/include/polly/CodeGen/RuntimeDebugBuilder.h b/polly/include/polly/CodeGen/RuntimeDebugBuilder.h
index 5d8d4c694c1..733cddee4b5 100644
--- a/polly/include/polly/CodeGen/RuntimeDebugBuilder.h
+++ b/polly/include/polly/CodeGen/RuntimeDebugBuilder.h
@@ -13,7 +13,6 @@
#define RUNTIME_DEBUG_BUILDER_H
#include "polly/CodeGen/IRBuilder.h"
-
#include <string>
namespace llvm {
diff --git a/polly/include/polly/DependenceInfo.h b/polly/include/polly/DependenceInfo.h
index fa0be3a4757..25bb7d41822 100644
--- a/polly/include/polly/DependenceInfo.h
+++ b/polly/include/polly/DependenceInfo.h
@@ -24,7 +24,6 @@
#define POLLY_DEPENDENCE_INFO_H
#include "polly/ScopPass.h"
-
#include "isl/ctx.h"
struct isl_pw_aff;
diff --git a/polly/include/polly/ScopDetection.h b/polly/include/polly/ScopDetection.h
index 492634a7841..6b664b06026 100644
--- a/polly/include/polly/ScopDetection.h
+++ b/polly/include/polly/ScopDetection.h
@@ -47,16 +47,12 @@
#ifndef POLLY_SCOP_DETECTION_H
#define POLLY_SCOP_DETECTION_H
-#include "llvm/Pass.h"
-#include "llvm/ADT/SetVector.h"
-#include "llvm/Analysis/AliasSetTracker.h"
-
#include "polly/ScopDetectionDiagnostic.h"
-
#include "llvm/ADT/SetVector.h"
-
-#include <set>
+#include "llvm/Analysis/AliasSetTracker.h"
+#include "llvm/Pass.h"
#include <map>
+#include <set>
using namespace llvm;
diff --git a/polly/include/polly/ScopDetectionDiagnostic.h b/polly/include/polly/ScopDetectionDiagnostic.h
index 9acb0446ec5..7d5da2bf25b 100644
--- a/polly/include/polly/ScopDetectionDiagnostic.h
+++ b/polly/include/polly/ScopDetectionDiagnostic.h
@@ -20,18 +20,17 @@
#ifndef POLLY_SCOP_DETECTION_DIAGNOSTIC_H
#define POLLY_SCOP_DETECTION_DIAGNOSTIC_H
-#include "llvm/Analysis/LoopInfo.h"
-#include "llvm/Analysis/AliasSetTracker.h"
-#include "llvm/IR/BasicBlock.h"
-#include "llvm/IR/Value.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/ADT/Twine.h"
+#include "llvm/Analysis/AliasSetTracker.h"
+#include "llvm/Analysis/LoopInfo.h"
#include "llvm/Analysis/ScalarEvolutionExpressions.h"
+#include "llvm/IR/BasicBlock.h"
+#include "llvm/IR/Value.h"
#include "llvm/Support/Casting.h"
-
-#include <string>
#include <memory>
+#include <string>
using namespace llvm;
diff --git a/polly/include/polly/ScopInfo.h b/polly/include/polly/ScopInfo.h
index fa86910f52a..e40ba5e542b 100644
--- a/polly/include/polly/ScopInfo.h
+++ b/polly/include/polly/ScopInfo.h
@@ -21,10 +21,8 @@
#define POLLY_SCOP_INFO_H
#include "polly/ScopDetection.h"
-
-#include "llvm/Analysis/RegionPass.h"
#include "llvm/ADT/MapVector.h"
-
+#include "llvm/Analysis/RegionPass.h"
#include "isl/ctx.h"
using namespace llvm;
diff --git a/polly/include/polly/Support/GICHelper.h b/polly/include/polly/Support/GICHelper.h
index a83588da1f1..608dfd86f45 100644
--- a/polly/include/polly/Support/GICHelper.h
+++ b/polly/include/polly/Support/GICHelper.h
@@ -15,9 +15,8 @@
#define POLLY_SUPPORT_GIC_HELPER_H
#include "llvm/ADT/APInt.h"
-#include "isl/ctx.h"
#include "llvm/Support/raw_ostream.h"
-
+#include "isl/ctx.h"
#include <string>
struct isl_map;
diff --git a/polly/include/polly/TempScopInfo.h b/polly/include/polly/TempScopInfo.h
index e830fac2274..ee65f564f3c 100644
--- a/polly/include/polly/TempScopInfo.h
+++ b/polly/include/polly/TempScopInfo.h
@@ -17,7 +17,6 @@
#define POLLY_TEMP_SCOP_EXTRACTION_H
#include "polly/ScopDetection.h"
-
#include "llvm/Analysis/RegionPass.h"
#include "llvm/IR/Instructions.h"
diff --git a/polly/lib/Analysis/DependenceInfo.cpp b/polly/lib/Analysis/DependenceInfo.cpp
index 75fde7ef19b..69d4e93943b 100644
--- a/polly/lib/Analysis/DependenceInfo.cpp
+++ b/polly/lib/Analysis/DependenceInfo.cpp
@@ -26,14 +26,13 @@
#include "polly/ScopInfo.h"
#include "polly/Support/GICHelper.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/set.h>
#include <isl/schedule.h>
+#include <isl/set.h>
using namespace polly;
using namespace llvm;
diff --git a/polly/lib/Analysis/ScopDetection.cpp b/polly/lib/Analysis/ScopDetection.cpp
index f7ea6c48ff2..3200a85c762 100644
--- a/polly/lib/Analysis/ScopDetection.cpp
+++ b/polly/lib/Analysis/ScopDetection.cpp
@@ -45,14 +45,14 @@
//===----------------------------------------------------------------------===//
#include "polly/CodeGen/BlockGenerators.h"
+#include "polly/CodeGen/CodeGeneration.h"
#include "polly/LinkAllPasses.h"
#include "polly/Options.h"
-#include "polly/ScopDetectionDiagnostic.h"
#include "polly/ScopDetection.h"
+#include "polly/ScopDetectionDiagnostic.h"
#include "polly/Support/SCEVValidator.h"
#include "polly/Support/ScopHelper.h"
#include "polly/Support/ScopLocation.h"
-#include "polly/CodeGen/CodeGeneration.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/Analysis/AliasAnalysis.h"
#include "llvm/Analysis/LoopInfo.h"
@@ -61,9 +61,9 @@
#include "llvm/Analysis/ScalarEvolution.h"
#include "llvm/Analysis/ScalarEvolutionExpressions.h"
#include "llvm/IR/DebugInfo.h"
-#include "llvm/IR/IntrinsicInst.h"
#include "llvm/IR/DiagnosticInfo.h"
#include "llvm/IR/DiagnosticPrinter.h"
+#include "llvm/IR/IntrinsicInst.h"
#include "llvm/IR/LLVMContext.h"
#include "llvm/Support/Debug.h"
#include <set>
diff --git a/polly/lib/Analysis/ScopDetectionDiagnostic.cpp b/polly/lib/Analysis/ScopDetectionDiagnostic.cpp
index f5b57f0fc83..d6539846767 100644
--- a/polly/lib/Analysis/ScopDetectionDiagnostic.cpp
+++ b/polly/lib/Analysis/ScopDetectionDiagnostic.cpp
@@ -19,19 +19,17 @@
//===----------------------------------------------------------------------===//
#include "polly/ScopDetectionDiagnostic.h"
#include "polly/Support/ScopLocation.h"
-
-#include "llvm/Analysis/LoopInfo.h"
+#include "llvm/ADT/SmallVector.h"
+#include "llvm/ADT/Statistic.h"
#include "llvm/Analysis/AliasSetTracker.h"
+#include "llvm/Analysis/LoopInfo.h"
+#include "llvm/Analysis/RegionInfo.h"
#include "llvm/IR/BasicBlock.h"
#include "llvm/IR/DebugInfo.h"
#include "llvm/IR/DebugLoc.h"
#include "llvm/IR/DiagnosticInfo.h"
#include "llvm/IR/LLVMContext.h"
#include "llvm/IR/Value.h"
-#include "llvm/ADT/SmallVector.h"
-#include "llvm/ADT/Statistic.h"
-
-#include "llvm/Analysis/RegionInfo.h"
#define DEBUG_TYPE "polly-detect"
#include "llvm/Support/Debug.h"
diff --git a/polly/lib/Analysis/ScopInfo.cpp b/polly/lib/Analysis/ScopInfo.cpp
index ca6bcb8514f..071e40c3c90 100644
--- a/polly/lib/Analysis/ScopInfo.cpp
+++ b/polly/lib/Analysis/ScopInfo.cpp
@@ -18,32 +18,30 @@
//===----------------------------------------------------------------------===//
#include "polly/LinkAllPasses.h"
-#include "polly/ScopInfo.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/TempScopInfo.h"
-#include "llvm/ADT/SetVector.h"
#include "llvm/ADT/MapVector.h"
+#include "llvm/ADT/SetVector.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/ADT/StringExtras.h"
-#include "llvm/Analysis/LoopInfo.h"
#include "llvm/Analysis/AliasAnalysis.h"
+#include "llvm/Analysis/LoopInfo.h"
#include "llvm/Analysis/RegionIterator.h"
#include "llvm/Analysis/ScalarEvolutionExpressions.h"
#include "llvm/Support/Debug.h"
-
-#include "isl/constraint.h"
-#include "isl/set.h"
-#include "isl/map.h"
-#include "isl/union_map.h"
#include "isl/aff.h"
-#include "isl/printer.h"
+#include "isl/constraint.h"
#include "isl/local_space.h"
+#include "isl/map.h"
#include "isl/options.h"
+#include "isl/printer.h"
+#include "isl/set.h"
+#include "isl/union_map.h"
#include "isl/val.h"
-
#include <sstream>
#include <string>
#include <vector>
diff --git a/polly/lib/Analysis/TempScopInfo.cpp b/polly/lib/Analysis/TempScopInfo.cpp
index 7bfd5647523..d11f2ffe482 100644
--- a/polly/lib/Analysis/TempScopInfo.cpp
+++ b/polly/lib/Analysis/TempScopInfo.cpp
@@ -14,9 +14,9 @@
//===----------------------------------------------------------------------===//
#include "polly/TempScopInfo.h"
-#include "polly/ScopDetection.h"
-#include "polly/LinkAllPasses.h"
#include "polly/CodeGen/BlockGenerators.h"
+#include "polly/LinkAllPasses.h"
+#include "polly/ScopDetection.h"
#include "polly/Support/GICHelper.h"
#include "polly/Support/SCEVValidator.h"
#include "polly/Support/ScopHelper.h"
diff --git a/polly/lib/CodeGen/BlockGenerators.cpp b/polly/lib/CodeGen/BlockGenerators.cpp
index 0e04235aca1..02ca41b6e18 100644
--- a/polly/lib/CodeGen/BlockGenerators.cpp
+++ b/polly/lib/CodeGen/BlockGenerators.cpp
@@ -21,21 +21,17 @@
#include "polly/Support/GICHelper.h"
#include "polly/Support/SCEVValidator.h"
#include "polly/Support/ScopHelper.h"
-
#include "llvm/Analysis/LoopInfo.h"
#include "llvm/Analysis/RegionInfo.h"
#include "llvm/Analysis/ScalarEvolution.h"
#include "llvm/Analysis/ScalarEvolutionExpander.h"
-
#include "llvm/IR/IntrinsicInst.h"
#include "llvm/IR/Module.h"
#include "llvm/Transforms/Utils/BasicBlockUtils.h"
-
#include "isl/aff.h"
#include "isl/ast.h"
-#include "isl/set.h"
#include "isl/ast_build.h"
-
+#include "isl/set.h"
#include <deque>
using namespace llvm;
diff --git a/polly/lib/CodeGen/IRBuilder.cpp b/polly/lib/CodeGen/IRBuilder.cpp
index ce74930285c..53eafb86a1e 100644
--- a/polly/lib/CodeGen/IRBuilder.cpp
+++ b/polly/lib/CodeGen/IRBuilder.cpp
@@ -13,10 +13,8 @@
//===----------------------------------------------------------------------===//
#include "polly/CodeGen/IRBuilder.h"
-
#include "polly/ScopInfo.h"
#include "polly/Support/ScopHelper.h"
-
#include "llvm/IR/Metadata.h"
#include "llvm/Support/Debug.h"
diff --git a/polly/lib/CodeGen/IslAst.cpp b/polly/lib/CodeGen/IslAst.cpp
index aa103f65b67..12f90bbf424 100644
--- a/polly/lib/CodeGen/IslAst.cpp
+++ b/polly/lib/CodeGen/IslAst.cpp
@@ -26,16 +26,14 @@
#include "polly/Options.h"
#include "polly/ScopInfo.h"
#include "polly/Support/GICHelper.h"
-
#include "llvm/Analysis/RegionInfo.h"
#include "llvm/Support/Debug.h"
-
-#include "isl/union_map.h"
-#include "isl/list.h"
+#include "isl/aff.h"
#include "isl/ast_build.h"
-#include "isl/set.h"
+#include "isl/list.h"
#include "isl/map.h"
-#include "isl/aff.h"
+#include "isl/set.h"
+#include "isl/union_map.h"
#define DEBUG_TYPE "polly-ast"
diff --git a/polly/lib/CodeGen/IslCodeGeneration.cpp b/polly/lib/CodeGen/IslCodeGeneration.cpp
index c92141e6559..7a4ff44e414 100644
--- a/polly/lib/CodeGen/IslCodeGeneration.cpp
+++ b/polly/lib/CodeGen/IslCodeGeneration.cpp
@@ -27,10 +27,9 @@
#include "polly/ScopInfo.h"
#include "polly/Support/ScopHelper.h"
#include "polly/TempScopInfo.h"
-
#include "llvm/IR/Module.h"
-#include "llvm/Support/Debug.h"
#include "llvm/IR/Verifier.h"
+#include "llvm/Support/Debug.h"
using namespace polly;
using namespace llvm;
diff --git a/polly/lib/CodeGen/IslExprBuilder.cpp b/polly/lib/CodeGen/IslExprBuilder.cpp
index b40578e4f4e..8cd145ca7c1 100644
--- a/polly/lib/CodeGen/IslExprBuilder.cpp
+++ b/polly/lib/CodeGen/IslExprBuilder.cpp
@@ -10,10 +10,8 @@
//===----------------------------------------------------------------------===//
#include "polly/CodeGen/IslExprBuilder.h"
-
#include "polly/ScopInfo.h"
#include "polly/Support/GICHelper.h"
-
#include "llvm/Analysis/ScalarEvolutionExpander.h"
#include "llvm/Support/Debug.h"
#include "llvm/Transforms/Utils/BasicBlockUtils.h"
diff --git a/polly/lib/CodeGen/IslNodeBuilder.cpp b/polly/lib/CodeGen/IslNodeBuilder.cpp
index 46b0d0ef6fe..2d8a05c57b2 100644
--- a/polly/lib/CodeGen/IslNodeBuilder.cpp
+++ b/polly/lib/CodeGen/IslNodeBuilder.cpp
@@ -13,40 +13,38 @@
//===----------------------------------------------------------------------===//
#include "polly/CodeGen/IslNodeBuilder.h"
-#include "polly/Config/config.h"
-#include "polly/CodeGen/IslExprBuilder.h"
#include "polly/CodeGen/BlockGenerators.h"
#include "polly/CodeGen/CodeGeneration.h"
#include "polly/CodeGen/IslAst.h"
+#include "polly/CodeGen/IslExprBuilder.h"
#include "polly/CodeGen/LoopGenerators.h"
#include "polly/CodeGen/Utils.h"
+#include "polly/Config/config.h"
#include "polly/DependenceInfo.h"
#include "polly/LinkAllPasses.h"
#include "polly/ScopInfo.h"
#include "polly/Support/GICHelper.h"
-#include "polly/Support/ScopHelper.h"
#include "polly/Support/SCEVValidator.h"
+#include "polly/Support/ScopHelper.h"
#include "polly/TempScopInfo.h"
-
#include "llvm/ADT/PostOrderIterator.h"
#include "llvm/ADT/SmallPtrSet.h"
#include "llvm/Analysis/LoopInfo.h"
#include "llvm/Analysis/PostDominators.h"
#include "llvm/Analysis/ScalarEvolutionExpander.h"
+#include "llvm/IR/DataLayout.h"
#include "llvm/IR/Module.h"
+#include "llvm/IR/Verifier.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Debug.h"
-#include "llvm/IR/Verifier.h"
-#include "llvm/IR/DataLayout.h"
#include "llvm/Transforms/Utils/BasicBlockUtils.h"
-
-#include "isl/union_map.h"
-#include "isl/list.h"
+#include "isl/aff.h"
#include "isl/ast.h"
#include "isl/ast_build.h"
-#include "isl/set.h"
+#include "isl/list.h"
#include "isl/map.h"
-#include "isl/aff.h"
+#include "isl/set.h"
+#include "isl/union_map.h"
using namespace polly;
using namespace llvm;
diff --git a/polly/lib/CodeGen/LoopGenerators.cpp b/polly/lib/CodeGen/LoopGenerators.cpp
index 06214082795..ba6591cf77f 100644
--- a/polly/lib/CodeGen/LoopGenerators.cpp
+++ b/polly/lib/CodeGen/LoopGenerators.cpp
@@ -17,8 +17,8 @@
#include "llvm/IR/DataLayout.h"
#include "llvm/IR/Dominators.h"
#include "llvm/IR/Module.h"
-#include "llvm/Transforms/Utils/BasicBlockUtils.h"
#include "llvm/Support/CommandLine.h"
+#include "llvm/Transforms/Utils/BasicBlockUtils.h"
using namespace llvm;
using namespace polly;
diff --git a/polly/lib/CodeGen/RuntimeDebugBuilder.cpp b/polly/lib/CodeGen/RuntimeDebugBuilder.cpp
index 7794c91f9be..edda9f2c7aa 100644
--- a/polly/lib/CodeGen/RuntimeDebugBuilder.cpp
+++ b/polly/lib/CodeGen/RuntimeDebugBuilder.cpp
@@ -10,7 +10,6 @@
//===----------------------------------------------------------------------===//
#include "polly/CodeGen/RuntimeDebugBuilder.h"
-
#include "llvm/IR/Module.h"
using namespace llvm;
diff --git a/polly/lib/CodeGen/Utils.cpp b/polly/lib/CodeGen/Utils.cpp
index 2c6d415cf8e..f2ddfd56e7d 100644
--- a/polly/lib/CodeGen/Utils.cpp
+++ b/polly/lib/CodeGen/Utils.cpp
@@ -14,7 +14,6 @@
#include "polly/CodeGen/Utils.h"
#include "polly/CodeGen/IRBuilder.h"
#include "polly/ScopInfo.h"
-
#include "llvm/Analysis/LoopInfo.h"
#include "llvm/Analysis/RegionInfo.h"
#include "llvm/Support/Debug.h"
diff --git a/polly/lib/Exchange/JSONExporter.cpp b/polly/lib/Exchange/JSONExporter.cpp
index 3cedb039685..6b12667f244 100644
--- a/polly/lib/Exchange/JSONExporter.cpp
+++ b/polly/lib/Exchange/JSONExporter.cpp
@@ -17,22 +17,18 @@
#include "polly/ScopInfo.h"
#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/MemoryBuffer.h"
#include "llvm/Support/ToolOutputFile.h"
-
-#include "json/reader.h"
-#include "json/writer.h"
-
-#include "isl/set.h"
-#include "isl/map.h"
#include "isl/constraint.h"
+#include "isl/map.h"
#include "isl/printer.h"
-
+#include "isl/set.h"
+#include "json/reader.h"
+#include "json/writer.h"
#include <memory>
#include <string>
#include <system_error>
diff --git a/polly/lib/Support/SCEVValidator.cpp b/polly/lib/Support/SCEVValidator.cpp
index f1d9443f4b0..b06e8beb7f9 100644
--- a/polly/lib/Support/SCEVValidator.cpp
+++ b/polly/lib/Support/SCEVValidator.cpp
@@ -1,11 +1,10 @@
#include "polly/Support/SCEVValidator.h"
#include "polly/ScopInfo.h"
+#include "llvm/Analysis/RegionInfo.h"
#include "llvm/Analysis/ScalarEvolution.h"
#include "llvm/Analysis/ScalarEvolutionExpressions.h"
-#include "llvm/Analysis/RegionInfo.h"
#include "llvm/Support/Debug.h"
-
#include <vector>
using namespace llvm;
diff --git a/polly/lib/Support/ScopLocation.cpp b/polly/lib/Support/ScopLocation.cpp
index ebf717dc709..8625c317dde 100644
--- a/polly/lib/Support/ScopLocation.cpp
+++ b/polly/lib/Support/ScopLocation.cpp
@@ -12,11 +12,10 @@
//===----------------------------------------------------------------------===//
//
#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/Analysis/RegionInfo.h"
using namespace llvm;
diff --git a/polly/lib/Transform/CodePreparation.cpp b/polly/lib/Transform/CodePreparation.cpp
index 39c2acc8851..9d4b55b24aa 100644
--- a/polly/lib/Transform/CodePreparation.cpp
+++ b/polly/lib/Transform/CodePreparation.cpp
@@ -27,8 +27,8 @@
//===----------------------------------------------------------------------===//
#include "polly/LinkAllPasses.h"
-#include "polly/ScopDetection.h"
#include "polly/CodeGen/BlockGenerators.h"
+#include "polly/ScopDetection.h"
#include "polly/Support/ScopHelper.h"
#include "llvm/Analysis/DominanceFrontier.h"
#include "llvm/Analysis/LoopInfo.h"
diff --git a/polly/lib/Transform/DeadCodeElimination.cpp b/polly/lib/Transform/DeadCodeElimination.cpp
index 07c7e6cc2f7..8221f891802 100644
--- a/polly/lib/Transform/DeadCodeElimination.cpp
+++ b/polly/lib/Transform/DeadCodeElimination.cpp
@@ -37,8 +37,8 @@
#include "polly/ScopInfo.h"
#include "llvm/Support/CommandLine.h"
#include "isl/flow.h"
-#include "isl/set.h"
#include "isl/map.h"
+#include "isl/set.h"
#include "isl/union_map.h"
using namespace llvm;
diff --git a/polly/lib/Transform/IndependentBlocks.cpp b/polly/lib/Transform/IndependentBlocks.cpp
index 8868b8f91c1..8a0c0f45bae 100644
--- a/polly/lib/Transform/IndependentBlocks.cpp
+++ b/polly/lib/Transform/IndependentBlocks.cpp
@@ -12,8 +12,8 @@
//===----------------------------------------------------------------------===//
//
#include "polly/LinkAllPasses.h"
-#include "polly/Options.h"
#include "polly/CodeGen/BlockGenerators.h"
+#include "polly/Options.h"
#include "polly/ScopDetection.h"
#include "polly/Support/ScopHelper.h"
#include "llvm/Analysis/DominanceFrontier.h"
@@ -22,10 +22,9 @@
#include "llvm/Analysis/RegionInfo.h"
#include "llvm/Analysis/ValueTracking.h"
#include "llvm/IR/IntrinsicInst.h"
-#include "llvm/Transforms/Utils/Local.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Debug.h"
-
+#include "llvm/Transforms/Utils/Local.h"
#include <vector>
using namespace polly;
diff --git a/polly/lib/Transform/ScheduleOptimizer.cpp b/polly/lib/Transform/ScheduleOptimizer.cpp
index 5df024487ed..37ab256167b 100644
--- a/polly/lib/Transform/ScheduleOptimizer.cpp
+++ b/polly/lib/Transform/ScheduleOptimizer.cpp
@@ -18,6 +18,13 @@
//===----------------------------------------------------------------------===//
#include "polly/ScheduleOptimizer.h"
+#include "polly/CodeGen/CodeGeneration.h"
+#include "polly/DependenceInfo.h"
+#include "polly/LinkAllPasses.h"
+#include "polly/Options.h"
+#include "polly/ScopInfo.h"
+#include "polly/Support/GICHelper.h"
+#include "llvm/Support/Debug.h"
#include "isl/aff.h"
#include "isl/band.h"
#include "isl/constraint.h"
@@ -26,13 +33,6 @@
#include "isl/schedule.h"
#include "isl/schedule_node.h"
#include "isl/space.h"
-#include "polly/CodeGen/CodeGeneration.h"
-#include "polly/DependenceInfo.h"
-#include "polly/LinkAllPasses.h"
-#include "polly/Options.h"
-#include "polly/ScopInfo.h"
-#include "polly/Support/GICHelper.h"
-#include "llvm/Support/Debug.h"
using namespace llvm;
using namespace polly;
OpenPOWER on IntegriCloud