[polly] r228441 - Do not run independent blocks when we model all scalar dependences

[Johannes Doerfert]

Author: jdoerfert
Date: Fri Feb  6 15:26:45 2015
New Revision: 228441

URL: http://llvm.org/viewvc/llvm-project?rev=228441&view=rev
Log:
Do not run independent blocks when we model all scalar dependences

Modified:
    polly/trunk/lib/Transform/IndependentBlocks.cpp
    polly/trunk/test/ScopInfo/phi_scalar_simple_2.ll

Modified: polly/trunk/lib/Transform/IndependentBlocks.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Transform/IndependentBlocks.cpp?rev=228441&r1=228440&r2=228441&view=diff
==============================================================================
--- polly/trunk/lib/Transform/IndependentBlocks.cpp (original)
+++ polly/trunk/lib/Transform/IndependentBlocks.cpp Fri Feb  6 15:26:45 2015
@@ -515,6 +515,9 @@ void IndependentBlocks::getAnalysisUsage
 }
 
 bool IndependentBlocks::runOnFunction(llvm::Function &F) {
+  if (DisableIntraScopScalarToArray && PollyModelPHINodes)
+    return false;
+
   bool Changed = false;
 
   RI = &getAnalysis<RegionInfoPass>().getRegionInfo();
@@ -548,6 +551,9 @@ bool IndependentBlocks::runOnFunction(ll
 }
 
 void IndependentBlocks::verifyAnalysis() const {
+  if (DisableIntraScopScalarToArray && PollyModelPHINodes)
+    return;
+
   for (const Region *R : *SD)
     verifyScop(R);
 }

Modified: polly/trunk/test/ScopInfo/phi_scalar_simple_2.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopInfo/phi_scalar_simple_2.ll?rev=228441&r1=228440&r2=228441&view=diff
==============================================================================
--- polly/trunk/test/ScopInfo/phi_scalar_simple_2.ll (original)
+++ polly/trunk/test/ScopInfo/phi_scalar_simple_2.ll Fri Feb  6 15:26:45 2015
@@ -20,8 +20,8 @@ for.cond:
 ; CHECK: Stmt_for_cond
 ; CHECK:     ReadAccess := [Reduction Type: NONE] [Scalar: 1]
 ; CHECK:         [N, c] -> { Stmt_for_cond[i0] -> MemRef_x_addr_0[] };
-; CHECK:     MustWriteAccess :=  [Reduction Type: NONE] [Scalar: 0]
-; CHECK:         [N, c] -> { Stmt_for_cond[i0] -> MemRef_x_addr_0_s2a[0] };
+; CHECK:     MustWriteAccess :=  [Reduction Type: NONE] [Scalar: 1]
+; CHECK:         [N, c] -> { Stmt_for_cond[i0] -> MemRef_x_addr_0[] };
 ; CHECK:     MustWriteAccess :=  [Reduction Type: NONE] [Scalar: 0]
 ; CHECK:         [N, c] -> { Stmt_for_cond[i0] -> MemRef_A[i0] };
 ; CHECK:     MustWriteAccess :=  [Reduction Type: NONE] [Scalar: 1]