[polly] r247288 - Merge TempScopInfo into ScopInfo
Michael Kruse via llvm-commits
llvm-commits at lists.llvm.org
Thu Sep 10 08:25:25 PDT 2015
Author: meinersbur
Date: Thu Sep 10 10:25:24 2015
New Revision: 247288
URL: http://llvm.org/viewvc/llvm-project?rev=247288&view=rev
Log:
Merge TempScopInfo into ScopInfo
The TempScopInfo (-polly-analyze-ir) pass is removed and its work taken
over by ScopInfo (-polly-scops). Several tests depend on
-polly-analyze-ir and use -polly-scops instead which for the moment
prints the output of both passes. This again is not expected by some
other tests, especially those with negative searches, which have been
adapted.
Differential Version: http://reviews.llvm.org/D12694
Modified:
polly/trunk/include/polly/LinkAllPasses.h
polly/trunk/include/polly/ScopInfo.h
polly/trunk/lib/Analysis/ScopInfo.cpp
polly/trunk/lib/CodeGen/CodeGeneration.cpp
polly/trunk/lib/Support/RegisterPasses.cpp
polly/trunk/test/ScopInfo/Alias-0.ll
polly/trunk/test/ScopInfo/Alias-1.ll
polly/trunk/test/ScopInfo/Alias-2.ll
polly/trunk/test/ScopInfo/Alias-3.ll
polly/trunk/test/ScopInfo/Alias-4.ll
polly/trunk/test/ScopInfo/aliasing_many_parameters_not_all_involved.ll
polly/trunk/test/ScopInfo/bug_2010_10_22.ll
polly/trunk/test/ScopInfo/bug_2011_1_5.ll
polly/trunk/test/ScopInfo/cond_in_loop.ll
polly/trunk/test/TempScop/inter_bb_scalar_dep.ll
polly/trunk/test/TempScop/intra_and_inter_bb_scalar_dep.ll
polly/trunk/test/TempScop/intra_bb_scalar_dep.ll
polly/trunk/test/TempScop/not-a-reduction.ll
polly/trunk/test/TempScop/scalar_to_array.ll
polly/trunk/test/TempScop/tempscop-printing.ll
Modified: polly/trunk/include/polly/LinkAllPasses.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/LinkAllPasses.h?rev=247288&r1=247287&r2=247288&view=diff
==============================================================================
--- polly/trunk/include/polly/LinkAllPasses.h (original)
+++ polly/trunk/include/polly/LinkAllPasses.h Thu Sep 10 10:25:24 2015
@@ -42,7 +42,6 @@ llvm::Pass *createScopInfoPass();
llvm::Pass *createIslAstInfoPass();
llvm::Pass *createCodeGenerationPass();
llvm::Pass *createIslScheduleOptimizerPass();
-llvm::Pass *createTempScopInfoPass();
extern char &IndependentBlocksID;
extern char &CodePreparationID;
@@ -74,7 +73,6 @@ struct PollyForcePassLinking {
polly::createIslAstInfoPass();
polly::createCodeGenerationPass();
polly::createIslScheduleOptimizerPass();
- polly::createTempScopInfoPass();
}
} PollyForcePassLinking; // Force link by creating a global definition.
}
Modified: polly/trunk/include/polly/ScopInfo.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/ScopInfo.h?rev=247288&r1=247287&r2=247288&view=diff
==============================================================================
--- polly/trunk/include/polly/ScopInfo.h (original)
+++ polly/trunk/include/polly/ScopInfo.h Thu Sep 10 10:25:24 2015
@@ -1399,7 +1399,7 @@ class TempScop {
// Access function of bbs.
AccFuncMapType &AccFuncMap;
- friend class TempScopInfo;
+ friend class ScopInfo;
explicit TempScop(Region &r, AccFuncMapType &accFuncMap)
: R(r), AccFuncMap(accFuncMap) {}
@@ -1442,14 +1442,14 @@ public:
};
typedef std::map<const Region *, TempScop *> TempScopMapType;
-//===----------------------------------------------------------------------===//
-/// @brief The Function Pass to extract temporary information for Static control
-/// part in llvm function.
+
+///===---------------------------------------------------------------------===//
+/// @brief Build the Polly IR (Scop and ScopStmt) on a Region.
///
-class TempScopInfo : public RegionPass {
+class ScopInfo : public RegionPass {
//===-------------------------------------------------------------------===//
- TempScopInfo(const TempScopInfo &) = delete;
- const TempScopInfo &operator=(const TempScopInfo &) = delete;
+ ScopInfo(const ScopInfo &) = delete;
+ const ScopInfo &operator=(const ScopInfo &) = delete;
// The ScalarEvolution to help building Scop.
ScalarEvolution *SE;
@@ -1476,6 +1476,10 @@ class TempScopInfo : public RegionPass {
// The TempScop for this region.
TempScop *TempScopOfRegion;
+ // The Scop
+ Scop *scop;
+ isl_ctx *ctx;
+
// Clear the context.
void clear();
@@ -1535,47 +1539,14 @@ class TempScopInfo : public RegionPass {
public:
static char ID;
- explicit TempScopInfo() : RegionPass(ID), TempScopOfRegion(nullptr) {}
- ~TempScopInfo();
+ explicit ScopInfo();
+ ~ScopInfo();
/// @brief Get the temporay Scop information in LLVM IR for this region.
///
/// @return The Scop information in LLVM IR represent.
TempScop *getTempScop() const;
- /// @name RegionPass interface
- //@{
- virtual void getAnalysisUsage(AnalysisUsage &AU) const;
- virtual void releaseMemory() { clear(); }
- virtual bool runOnRegion(Region *R, RGPassManager &RGM);
- virtual void print(raw_ostream &OS, const Module *) const;
- //@}
-};
-
-///===---------------------------------------------------------------------===//
-/// @brief Build the Polly IR (Scop and ScopStmt) on a Region.
-///
-class ScopInfo : public RegionPass {
- //===-------------------------------------------------------------------===//
- ScopInfo(const ScopInfo &) = delete;
- const ScopInfo &operator=(const ScopInfo &) = delete;
-
- // The Scop
- Scop *scop;
- isl_ctx *ctx;
-
- void clear() {
- if (scop) {
- delete scop;
- scop = 0;
- }
- }
-
-public:
- static char ID;
- explicit ScopInfo();
- ~ScopInfo();
-
/// @brief Try to build the Polly IR of static control part on the current
/// SESE-Region.
///
@@ -1590,12 +1561,7 @@ public:
virtual bool runOnRegion(Region *R, RGPassManager &RGM);
virtual void getAnalysisUsage(AnalysisUsage &AU) const;
virtual void releaseMemory() { clear(); }
- virtual void print(raw_ostream &OS, const Module *) const {
- if (scop)
- scop->print(OS);
- else
- OS << "Invalid Scop!\n";
- }
+ virtual void print(raw_ostream &OS, const Module *) const;
//@}
};
@@ -1603,7 +1569,6 @@ public:
namespace llvm {
class PassRegistry;
-void initializeTempScopInfoPass(llvm::PassRegistry &);
void initializeScopInfoPass(llvm::PassRegistry &);
}
Modified: polly/trunk/lib/Analysis/ScopInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopInfo.cpp?rev=247288&r1=247287&r2=247288&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/ScopInfo.cpp (original)
+++ polly/trunk/lib/Analysis/ScopInfo.cpp Thu Sep 10 10:25:24 2015
@@ -2568,10 +2568,9 @@ int Scop::getRelativeLoopDepth(const Loo
return L->getLoopDepth() - OuterLoop->getLoopDepth();
}
-void TempScopInfo::buildPHIAccesses(PHINode *PHI, Region &R,
- AccFuncSetType &Functions,
- Region *NonAffineSubRegion,
- bool IsExitBlock) {
+void ScopInfo::buildPHIAccesses(PHINode *PHI, Region &R,
+ AccFuncSetType &Functions,
+ Region *NonAffineSubRegion, bool IsExitBlock) {
// PHI nodes that are in the exit block of the region, hence if IsExitBlock is
// true, are not modeled as ordinary PHI nodes as they are not part of the
@@ -2632,8 +2631,8 @@ void TempScopInfo::buildPHIAccesses(PHIN
}
}
-bool TempScopInfo::buildScalarDependences(Instruction *Inst, Region *R,
- Region *NonAffineSubRegion) {
+bool ScopInfo::buildScalarDependences(Instruction *Inst, Region *R,
+ Region *NonAffineSubRegion) {
bool canSynthesizeInst = canSynthesize(Inst, LI, SE, R);
if (isIgnoredIntrinsic(Inst))
return false;
@@ -2712,8 +2711,8 @@ bool TempScopInfo::buildScalarDependence
extern MapInsnToMemAcc InsnToMemAcc;
IRAccess
-TempScopInfo::buildIRAccess(Instruction *Inst, Loop *L, Region *R,
- const ScopDetection::BoxedLoopsSetTy *BoxedLoops) {
+ScopInfo::buildIRAccess(Instruction *Inst, Loop *L, Region *R,
+ const ScopDetection::BoxedLoopsSetTy *BoxedLoops) {
unsigned Size;
Type *SizeType;
Value *Val;
@@ -2769,7 +2768,7 @@ TempScopInfo::buildIRAccess(Instruction
Subscripts, Sizes, Val);
}
-void TempScopInfo::buildAccessFunctions(Region &R, Region &SR) {
+void ScopInfo::buildAccessFunctions(Region &R, Region &SR) {
if (SD->isNonAffineSubRegion(&SR, &R)) {
for (BasicBlock *BB : SR.blocks())
@@ -2784,9 +2783,9 @@ void TempScopInfo::buildAccessFunctions(
buildAccessFunctions(R, *I->getNodeAs<BasicBlock>());
}
-void TempScopInfo::buildAccessFunctions(Region &R, BasicBlock &BB,
- Region *NonAffineSubRegion,
- bool IsExitBlock) {
+void ScopInfo::buildAccessFunctions(Region &R, BasicBlock &BB,
+ Region *NonAffineSubRegion,
+ bool IsExitBlock) {
AccFuncSetType Functions;
Loop *L = LI->getLoopFor(&BB);
@@ -2829,7 +2828,7 @@ void TempScopInfo::buildAccessFunctions(
Accs.insert(Accs.end(), Functions.begin(), Functions.end());
}
-TempScop *TempScopInfo::buildTempScop(Region &R) {
+TempScop *ScopInfo::buildTempScop(Region &R) {
TempScop *TScop = new TempScop(R, AccFuncMap);
buildAccessFunctions(R, R);
@@ -2847,69 +2846,32 @@ TempScop *TempScopInfo::buildTempScop(Re
return TScop;
}
-TempScop *TempScopInfo::getTempScop() const { return TempScopOfRegion; }
+TempScop *ScopInfo::getTempScop() const { return TempScopOfRegion; }
-void TempScopInfo::print(raw_ostream &OS, const Module *) const {
+void ScopInfo::print(raw_ostream &OS, const Module *) const {
if (TempScopOfRegion)
TempScopOfRegion->print(OS, SE, LI);
-}
-
-bool TempScopInfo::runOnRegion(Region *R, RGPassManager &RGM) {
- SD = &getAnalysis<ScopDetection>();
-
- if (!SD->isMaxRegionInScop(*R))
- return false;
-
- Function *F = R->getEntry()->getParent();
- SE = &getAnalysis<ScalarEvolutionWrapperPass>().getSE();
- LI = &getAnalysis<LoopInfoWrapperPass>().getLoopInfo();
- AA = &getAnalysis<AAResultsWrapperPass>().getAAResults();
- TD = &F->getParent()->getDataLayout();
- ZeroOffset = SE->getConstant(TD->getIntPtrType(F->getContext()), 0);
-
- assert(!TempScopOfRegion && "Build the TempScop only once");
- TempScopOfRegion = buildTempScop(*R);
-
- return false;
-}
-void TempScopInfo::getAnalysisUsage(AnalysisUsage &AU) const {
- AU.addRequiredTransitive<LoopInfoWrapperPass>();
- AU.addRequiredTransitive<ScalarEvolutionWrapperPass>();
- AU.addRequiredTransitive<ScopDetection>();
- AU.addRequiredID(IndependentBlocksID);
- AU.addRequired<AAResultsWrapperPass>();
- AU.setPreservesAll();
+ if (scop)
+ scop->print(OS);
+ else
+ OS << "Invalid Scop!\n";
}
-TempScopInfo::~TempScopInfo() { clear(); }
-
-void TempScopInfo::clear() {
+void ScopInfo::clear() {
AccFuncMap.clear();
if (TempScopOfRegion)
delete TempScopOfRegion;
TempScopOfRegion = nullptr;
-}
-
-//===----------------------------------------------------------------------===//
-// TempScop information extraction pass implement
-char TempScopInfo::ID = 0;
-Pass *polly::createTempScopInfoPass() { return new TempScopInfo(); }
-
-INITIALIZE_PASS_BEGIN(TempScopInfo, "polly-analyze-ir",
- "Polly - Analyse the LLVM-IR in the detected regions",
- false, false);
-INITIALIZE_PASS_DEPENDENCY(AAResultsWrapperPass);
-INITIALIZE_PASS_DEPENDENCY(LoopInfoWrapperPass);
-INITIALIZE_PASS_DEPENDENCY(RegionInfoPass);
-INITIALIZE_PASS_DEPENDENCY(ScalarEvolutionWrapperPass);
-INITIALIZE_PASS_END(TempScopInfo, "polly-analyze-ir",
- "Polly - Analyse the LLVM-IR in the detected regions",
- false, false)
+ if (scop) {
+ delete scop;
+ scop = 0;
+ }
+}
//===----------------------------------------------------------------------===//
-ScopInfo::ScopInfo() : RegionPass(ID), scop(0) {
+ScopInfo::ScopInfo() : RegionPass(ID), TempScopOfRegion(nullptr), scop(0) {
ctx = isl_ctx_alloc();
isl_options_set_on_error(ctx, ISL_ON_ERROR_ABORT);
}
@@ -2920,32 +2882,41 @@ ScopInfo::~ScopInfo() {
}
void ScopInfo::getAnalysisUsage(AnalysisUsage &AU) const {
+ AU.addRequiredID(IndependentBlocksID);
AU.addRequired<LoopInfoWrapperPass>();
AU.addRequired<RegionInfoPass>();
AU.addRequired<DominatorTreeWrapperPass>();
- AU.addRequired<ScalarEvolutionWrapperPass>();
- AU.addRequired<ScopDetection>();
- AU.addRequired<TempScopInfo>();
+ AU.addRequiredTransitive<ScalarEvolutionWrapperPass>();
+ AU.addRequiredTransitive<ScopDetection>();
AU.addRequired<AAResultsWrapperPass>();
AU.setPreservesAll();
}
bool ScopInfo::runOnRegion(Region *R, RGPassManager &RGM) {
- LoopInfo &LI = getAnalysis<LoopInfoWrapperPass>().getLoopInfo();
- AliasAnalysis &AA = getAnalysis<AAResultsWrapperPass>().getAAResults();
- ScopDetection &SD = getAnalysis<ScopDetection>();
- ScalarEvolution &SE = getAnalysis<ScalarEvolutionWrapperPass>().getSE();
+ SD = &getAnalysis<ScopDetection>();
+
+ if (!SD->isMaxRegionInScop(*R))
+ return false;
+
+ Function *F = R->getEntry()->getParent();
+ SE = &getAnalysis<ScalarEvolutionWrapperPass>().getSE();
+ LI = &getAnalysis<LoopInfoWrapperPass>().getLoopInfo();
+ AA = &getAnalysis<AAResultsWrapperPass>().getAAResults();
+ TD = &F->getParent()->getDataLayout();
DominatorTree &DT = getAnalysis<DominatorTreeWrapperPass>().getDomTree();
+ ZeroOffset = SE->getConstant(TD->getIntPtrType(F->getContext()), 0);
- TempScop *tempScop = getAnalysis<TempScopInfo>().getTempScop();
+ assert(!TempScopOfRegion && "Build the TempScop only once");
+ TempScopOfRegion = buildTempScop(*R);
// This region is no Scop.
- if (!tempScop) {
+ if (!TempScopOfRegion) {
scop = nullptr;
return false;
}
- scop = Scop::createFromTempScop(*tempScop, LI, SE, SD, AA, DT, ctx);
+ scop =
+ Scop::createFromTempScop(*TempScopOfRegion, *LI, *SE, *SD, *AA, DT, ctx);
DEBUG(scop->print(dbgs()));
@@ -2974,7 +2945,6 @@ INITIALIZE_PASS_DEPENDENCY(LoopInfoWrapp
INITIALIZE_PASS_DEPENDENCY(RegionInfoPass);
INITIALIZE_PASS_DEPENDENCY(ScalarEvolutionWrapperPass);
INITIALIZE_PASS_DEPENDENCY(ScopDetection);
-INITIALIZE_PASS_DEPENDENCY(TempScopInfo);
INITIALIZE_PASS_DEPENDENCY(DominatorTreeWrapperPass);
INITIALIZE_PASS_END(ScopInfo, "polly-scops",
"Polly - Create polyhedral description of Scops", false,
Modified: polly/trunk/lib/CodeGen/CodeGeneration.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/CodeGeneration.cpp?rev=247288&r1=247287&r2=247288&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/CodeGeneration.cpp (original)
+++ polly/trunk/lib/CodeGen/CodeGeneration.cpp Thu Sep 10 10:25:24 2015
@@ -186,7 +186,6 @@ public:
// FIXME: We do not yet add regions for the newly generated code to the
// region tree.
AU.addPreserved<RegionInfoPass>();
- AU.addPreserved<TempScopInfo>();
AU.addPreserved<ScopInfo>();
AU.addPreservedID(IndependentBlocksID);
}
Modified: polly/trunk/lib/Support/RegisterPasses.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Support/RegisterPasses.cpp?rev=247288&r1=247287&r2=247288&view=diff
==============================================================================
--- polly/trunk/lib/Support/RegisterPasses.cpp (original)
+++ polly/trunk/lib/Support/RegisterPasses.cpp Thu Sep 10 10:25:24 2015
@@ -154,7 +154,6 @@ void initializePollyPasses(PassRegistry
initializePollyCanonicalizePass(Registry);
initializeScopDetectionPass(Registry);
initializeScopInfoPass(Registry);
- initializeTempScopInfoPass(Registry);
}
/// @brief Register Polly passes such that they form a polyhedral optimizer.
Modified: polly/trunk/test/ScopInfo/Alias-0.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/Alias-0.ll?rev=247288&r1=247287&r2=247288&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/Alias-0.ll (original)
+++ polly/trunk/test/ScopInfo/Alias-0.ll Thu Sep 10 10:25:24 2015
@@ -1,5 +1,5 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-code-generator=isl -polly-analyze-ir -analyze < %s -stats 2>&1 | FileCheck %s --check-prefix=RTA
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-code-generator=isl -polly-analyze-ir -polly-use-runtime-alias-checks=false -analyze < %s -stats 2>&1 | FileCheck %s --check-prefix=NORTA
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-code-generator=isl -polly-scops -analyze < %s -stats 2>&1 | FileCheck %s --check-prefix=RTA
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-code-generator=isl -polly-scops -polly-use-runtime-alias-checks=false -analyze < %s -stats 2>&1 | FileCheck %s --check-prefix=NORTA
; REQUIRES: asserts
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
Modified: polly/trunk/test/ScopInfo/Alias-1.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/Alias-1.ll?rev=247288&r1=247287&r2=247288&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/Alias-1.ll (original)
+++ polly/trunk/test/ScopInfo/Alias-1.ll Thu Sep 10 10:25:24 2015
@@ -1,5 +1,5 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-code-generator=isl -polly-analyze-ir -analyze < %s -stats 2>&1 | FileCheck %s --check-prefix=RTA
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-code-generator=isl -polly-analyze-ir -polly-use-runtime-alias-checks=false -analyze < %s -stats 2>&1 | FileCheck %s --check-prefix=NORTA
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-code-generator=isl -polly-scops -analyze < %s -stats 2>&1 | FileCheck %s --check-prefix=RTA
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-code-generator=isl -polly-scops -polly-use-runtime-alias-checks=false -analyze < %s -stats 2>&1 | FileCheck %s --check-prefix=NORTA
; REQUIRES: asserts
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
Modified: polly/trunk/test/ScopInfo/Alias-2.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/Alias-2.ll?rev=247288&r1=247287&r2=247288&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/Alias-2.ll (original)
+++ polly/trunk/test/ScopInfo/Alias-2.ll Thu Sep 10 10:25:24 2015
@@ -1,5 +1,5 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-code-generator=isl -polly-analyze-ir -analyze < %s -stats 2>&1 | FileCheck %s --check-prefix=RTA
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-code-generator=isl -polly-analyze-ir -polly-use-runtime-alias-checks=false -analyze < %s -stats 2>&1 | FileCheck %s --check-prefix=NORTA
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-code-generator=isl -polly-scops -analyze < %s -stats 2>&1 | FileCheck %s --check-prefix=RTA
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-code-generator=isl -polly-scops -polly-use-runtime-alias-checks=false -analyze < %s -stats 2>&1 | FileCheck %s --check-prefix=NORTA
; REQUIRES: asserts
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
Modified: polly/trunk/test/ScopInfo/Alias-3.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/Alias-3.ll?rev=247288&r1=247287&r2=247288&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/Alias-3.ll (original)
+++ polly/trunk/test/ScopInfo/Alias-3.ll Thu Sep 10 10:25:24 2015
@@ -1,5 +1,5 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-code-generator=isl -polly-analyze-ir -analyze < %s -stats 2>&1 | FileCheck %s --check-prefix=RTA
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-code-generator=isl -polly-analyze-ir -polly-use-runtime-alias-checks=false -analyze < %s -stats 2>&1 | FileCheck %s --check-prefix=NORTA
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-code-generator=isl -polly-scops -analyze < %s -stats 2>&1 | FileCheck %s --check-prefix=RTA
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-code-generator=isl -polly-scops -polly-use-runtime-alias-checks=false -analyze < %s -stats 2>&1 | FileCheck %s --check-prefix=NORTA
; REQUIRES: asserts
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
Modified: polly/trunk/test/ScopInfo/Alias-4.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/Alias-4.ll?rev=247288&r1=247287&r2=247288&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/Alias-4.ll (original)
+++ polly/trunk/test/ScopInfo/Alias-4.ll Thu Sep 10 10:25:24 2015
@@ -1,5 +1,5 @@
-; RUN: opt %loadPolly -disable-basicaa -polly-detect-unprofitable -polly-code-generator=isl -polly-analyze-ir -analyze < %s -stats 2>&1 | FileCheck %s --check-prefix=RTA
-; RUN: opt %loadPolly -disable-basicaa -polly-detect-unprofitable -polly-code-generator=isl -polly-analyze-ir -polly-use-runtime-alias-checks=false -analyze < %s -stats 2>&1 | FileCheck %s --check-prefix=NORTA
+; RUN: opt %loadPolly -disable-basicaa -polly-detect-unprofitable -polly-code-generator=isl -polly-scops -analyze < %s -stats 2>&1 | FileCheck %s --check-prefix=RTA
+; RUN: opt %loadPolly -disable-basicaa -polly-detect-unprofitable -polly-code-generator=isl -polly-scops -polly-use-runtime-alias-checks=false -analyze < %s -stats 2>&1 | FileCheck %s --check-prefix=NORTA
; REQUIRES: asserts
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
Modified: polly/trunk/test/ScopInfo/aliasing_many_parameters_not_all_involved.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/aliasing_many_parameters_not_all_involved.ll?rev=247288&r1=247287&r2=247288&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/aliasing_many_parameters_not_all_involved.ll (original)
+++ polly/trunk/test/ScopInfo/aliasing_many_parameters_not_all_involved.ll Thu Sep 10 10:25:24 2015
@@ -4,11 +4,11 @@
; Check that we allow this SCoP even though it has 10 parameters involved in posisbly aliasing accesses.
; However, only 7 are involved in accesses through B, 8 through C and none in accesses through A.
;
-; MAX8: Printing analysis 'Polly - Create polyhedral description of Scops' for region: 'for.cond => for.end' in function 'jd':
-; MAX8-NEXT: Function: jd
+; MAX8-LABEL: Printing analysis 'Polly - Create polyhedral description of Scops' for region: 'for.cond => for.end' in function 'jd':
+; MAX8: Function: jd
-; MAX7: Printing analysis 'Polly - Create polyhedral description of Scops' for region: 'for.cond => for.end' in function 'jd':
-; MAX7-NEXT: Invalid Scop!
+; MAX7-LABEL: Printing analysis 'Polly - Create polyhedral description of Scops' for region: 'for.cond => for.end' in function 'jd':
+; MAX7: Invalid Scop!
;
; void jd(int *A, int *B, int *C, long p1, long p2, long p3, long p4, long p5,
; long p6, long p7, long p8, long p9, long p10) {
Modified: polly/trunk/test/ScopInfo/bug_2010_10_22.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/bug_2010_10_22.ll?rev=247288&r1=247287&r2=247288&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/bug_2010_10_22.ll (original)
+++ polly/trunk/test/ScopInfo/bug_2010_10_22.ll Thu Sep 10 10:25:24 2015
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-analyze-ir < %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops < %s
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
Modified: polly/trunk/test/ScopInfo/bug_2011_1_5.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/bug_2011_1_5.ll?rev=247288&r1=247287&r2=247288&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/bug_2011_1_5.ll (original)
+++ polly/trunk/test/ScopInfo/bug_2011_1_5.ll Thu Sep 10 10:25:24 2015
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-analyze-ir -analyze < %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -analyze < %s
; Bug description: Alias Analysis thinks IntToPtrInst aliases with alloca instructions created by IndependentBlocks Pass.
; This will trigger the assertion when we are verifying the SCoP after IndependentBlocks.
Modified: polly/trunk/test/ScopInfo/cond_in_loop.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/cond_in_loop.ll?rev=247288&r1=247287&r2=247288&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/cond_in_loop.ll (original)
+++ polly/trunk/test/ScopInfo/cond_in_loop.ll Thu Sep 10 10:25:24 2015
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-analyze-ir -analyze < %s | not FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -analyze < %s | FileCheck %s
;void f(long a[], long N, long M) {
; long i, j, k;
@@ -44,4 +44,5 @@ return:
ret void
}
-; CHECK: Scop!
+; CHECK-LABEL: Printing analysis 'Polly - Create polyhedral description of Scops' for region: 'bb => return' in function 'f':
+; CHECK-NEXT: Scop: bb => return
Modified: polly/trunk/test/TempScop/inter_bb_scalar_dep.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/TempScop/inter_bb_scalar_dep.ll?rev=247288&r1=247287&r2=247288&view=diff
==============================================================================
--- polly/trunk/test/TempScop/inter_bb_scalar_dep.ll (original)
+++ polly/trunk/test/TempScop/inter_bb_scalar_dep.ll Thu Sep 10 10:25:24 2015
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -basicaa -polly-analyze-ir -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -basicaa -polly-scops -analyze < %s | FileCheck %s
; void f(long A[], int N, int *init_ptr) {
; long i, j;
Modified: polly/trunk/test/TempScop/intra_and_inter_bb_scalar_dep.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/TempScop/intra_and_inter_bb_scalar_dep.ll?rev=247288&r1=247287&r2=247288&view=diff
==============================================================================
--- polly/trunk/test/TempScop/intra_and_inter_bb_scalar_dep.ll (original)
+++ polly/trunk/test/TempScop/intra_and_inter_bb_scalar_dep.ll Thu Sep 10 10:25:24 2015
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -basicaa -polly-analyze-ir -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -basicaa -polly-scops -analyze < %s | FileCheck %s
; void f(long A[], int N, int *init_ptr) {
; long i, j;
Modified: polly/trunk/test/TempScop/intra_bb_scalar_dep.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/TempScop/intra_bb_scalar_dep.ll?rev=247288&r1=247287&r2=247288&view=diff
==============================================================================
--- polly/trunk/test/TempScop/intra_bb_scalar_dep.ll (original)
+++ polly/trunk/test/TempScop/intra_bb_scalar_dep.ll Thu Sep 10 10:25:24 2015
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -basicaa -polly-analyze-ir -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -basicaa -polly-scops -analyze < %s | FileCheck %s
; void f(long A[], int N, int *init_ptr) {
; long i, j;
Modified: polly/trunk/test/TempScop/not-a-reduction.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/TempScop/not-a-reduction.ll?rev=247288&r1=247287&r2=247288&view=diff
==============================================================================
--- polly/trunk/test/TempScop/not-a-reduction.ll (original)
+++ polly/trunk/test/TempScop/not-a-reduction.ll Thu Sep 10 10:25:24 2015
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -polly-analyze-ir -analyze < %s 2>&1 | not FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -polly-scops -analyze < %s 2>&1 | not FileCheck %s
;#define TYPE float
;#define NUM 4
@@ -47,4 +47,5 @@ bb8:
ret void
}
-; CHECK: Reduction
+; Match any reduction type except "[Reduction Type: NONE]"
+; CHECK: [Reduction Type: {{[^N].*}}]
Modified: polly/trunk/test/TempScop/scalar_to_array.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/TempScop/scalar_to_array.ll?rev=247288&r1=247287&r2=247288&view=diff
==============================================================================
--- polly/trunk/test/TempScop/scalar_to_array.ll (original)
+++ polly/trunk/test/TempScop/scalar_to_array.ll Thu Sep 10 10:25:24 2015
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -basicaa -polly-analyze-ir -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -polly-detect-unprofitable -basicaa -polly-scops -analyze < %s | FileCheck %s
; ModuleID = 'scalar_to_array.ll'
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64"
Modified: polly/trunk/test/TempScop/tempscop-printing.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/TempScop/tempscop-printing.ll?rev=247288&r1=247287&r2=247288&view=diff
==============================================================================
--- polly/trunk/test/TempScop/tempscop-printing.ll (original)
+++ polly/trunk/test/TempScop/tempscop-printing.ll Thu Sep 10 10:25:24 2015
@@ -1,4 +1,4 @@
-; RUN: opt %loadPolly -polly-detect-unprofitable -basicaa -polly-analyze-ir -analyze < %s | FileCheck %s -check-prefix=SCALARACCESS
+; RUN: opt %loadPolly -polly-detect-unprofitable -basicaa -polly-scops -analyze < %s | FileCheck %s -check-prefix=SCALARACCESS
; void f(long A[], int N, int *init_ptr) {
; long i, j;
More information about the llvm-commits
mailing list