diff options
| -rw-r--r-- | polly/lib/Analysis/ScopDetection.cpp | 18 | ||||
| -rw-r--r-- | polly/test/Isl/CodeGen/20120316-InvalidCast.ll | 2 | ||||
| -rw-r--r-- | polly/test/Isl/CodeGen/constant_condition.ll | 2 | ||||
| -rw-r--r-- | polly/test/Isl/CodeGen/simple_non_single_entry.ll | 4 | ||||
| -rw-r--r-- | polly/test/ScopDetect/non-affine-loop.ll | 8 | ||||
| -rw-r--r-- | polly/test/ScopDetect/parametric-multiply-in-scev.ll | 4 | ||||
| -rw-r--r-- | polly/test/ScopDetect/simple_non_single_entry.ll | 4 | ||||
| -rw-r--r-- | polly/test/ScopDetectionDiagnostics/ReportLoopBound-01.ll | 2 | ||||
| -rw-r--r-- | polly/test/ScopInfo/cfg_consequences.ll | 2 |
9 files changed, 14 insertions, 32 deletions
diff --git a/polly/lib/Analysis/ScopDetection.cpp b/polly/lib/Analysis/ScopDetection.cpp index 0126bd42e58..5046285245c 100644 --- a/polly/lib/Analysis/ScopDetection.cpp +++ b/polly/lib/Analysis/ScopDetection.cpp @@ -73,18 +73,6 @@ using namespace polly; #define DEBUG_TYPE "polly-detect" -static cl::opt<bool> - DetectScopsWithoutLoops("polly-detect-scops-in-functions-without-loops", - cl::desc("Detect scops in functions without loops"), - cl::Hidden, cl::init(false), cl::ZeroOrMore, - cl::cat(PollyCategory)); - -static cl::opt<bool> - DetectRegionsWithoutLoops("polly-detect-scops-in-regions-without-loops", - cl::desc("Detect scops in regions without loops"), - cl::Hidden, cl::init(false), cl::ZeroOrMore, - cl::cat(PollyCategory)); - static cl::opt<bool> DetectUnprofitable("polly-detect-unprofitable", cl::desc("Detect unprofitable scops"), cl::Hidden, cl::init(false), @@ -877,7 +865,7 @@ void ScopDetection::findScops(Region &R) { false /*verifying*/); bool RegionIsValid = false; - if (!DetectRegionsWithoutLoops && regionWithoutLoops(R, LI)) + if (!DetectUnprofitable && regionWithoutLoops(R, LI)) invalid<ReportUnprofitable>(Context, /*Assert=*/true, &R); else RegionIsValid = isValidRegion(Context); @@ -1027,7 +1015,7 @@ bool ScopDetection::isValidRegion(DetectionContext &Context) const { // Check if there was at least one non-overapproximated loop in the region or // we allow regions without loops. - if (!DetectRegionsWithoutLoops && !Context.hasAffineLoops) + if (!DetectUnprofitable && !Context.hasAffineLoops) invalid<ReportUnprofitable>(Context, /*Assert=*/true, &CurRegion); DEBUG(dbgs() << "OK\n"); @@ -1083,7 +1071,7 @@ void ScopDetection::emitMissedRemarksForLeaves(const Function &F, bool ScopDetection::runOnFunction(llvm::Function &F) { LI = &getAnalysis<LoopInfoWrapperPass>().getLoopInfo(); RI = &getAnalysis<RegionInfoPass>().getRegionInfo(); - if (!DetectScopsWithoutLoops && LI->empty()) + if (!DetectUnprofitable && LI->empty()) return false; AA = &getAnalysis<AliasAnalysis>(); diff --git a/polly/test/Isl/CodeGen/20120316-InvalidCast.ll b/polly/test/Isl/CodeGen/20120316-InvalidCast.ll index 2eac103616a..8ef27fd7b63 100644 --- a/polly/test/Isl/CodeGen/20120316-InvalidCast.ll +++ b/polly/test/Isl/CodeGen/20120316-InvalidCast.ll @@ -1,4 +1,4 @@ -; RUN: opt %loadPolly -polly-detect-unprofitable -S -polly-detect-scops-in-functions-without-loops -polly-detect-scops-in-regions-without-loops -polly-codegen -polly-no-early-exit < %s | FileCheck %s +; RUN: opt %loadPolly -polly-detect-unprofitable -S -polly-codegen -polly-no-early-exit < %s | FileCheck %s ; CHECK: polly.start diff --git a/polly/test/Isl/CodeGen/constant_condition.ll b/polly/test/Isl/CodeGen/constant_condition.ll index 53d45fcfac2..6c7c44b8ac1 100644 --- a/polly/test/Isl/CodeGen/constant_condition.ll +++ b/polly/test/Isl/CodeGen/constant_condition.ll @@ -1,4 +1,4 @@ -;RUN: opt %loadPolly -polly-detect-unprofitable -polly-no-early-exit -polly-prepare -polly-detect-scops-in-regions-without-loops -polly-detect-scops-in-functions-without-loops -polly-ast -analyze < %s | FileCheck %s +;RUN: opt %loadPolly -polly-detect-unprofitable -polly-no-early-exit -polly-prepare -polly-ast -analyze < %s | FileCheck %s ;#include <string.h> ;int A[1]; diff --git a/polly/test/Isl/CodeGen/simple_non_single_entry.ll b/polly/test/Isl/CodeGen/simple_non_single_entry.ll index 30a4d275fe6..fe128fed309 100644 --- a/polly/test/Isl/CodeGen/simple_non_single_entry.ll +++ b/polly/test/Isl/CodeGen/simple_non_single_entry.ll @@ -1,5 +1,5 @@ -; RUN: opt %loadPolly -polly-detect-unprofitable -polly-no-early-exit -polly-detect-scops-in-regions-without-loops -polly-codegen -analyze < %s | FileCheck %s -; RUN: opt %loadPolly -polly-detect-unprofitable -polly-no-early-exit -polly-detect-scops-in-regions-without-loops -polly-codegen -S < %s | FileCheck %s -check-prefix=CHECK-CODE +; RUN: opt %loadPolly -polly-detect-unprofitable -polly-no-early-exit -polly-codegen -analyze < %s | FileCheck %s +; RUN: opt %loadPolly -polly-detect-unprofitable -polly-no-early-exit -polly-codegen -S < %s | FileCheck %s -check-prefix=CHECK-CODE ; void f(long A[], long N) { ; long i; diff --git a/polly/test/ScopDetect/non-affine-loop.ll b/polly/test/ScopDetect/non-affine-loop.ll index 6f2092a5e81..638a5d5e770 100644 --- a/polly/test/ScopDetect/non-affine-loop.ll +++ b/polly/test/ScopDetect/non-affine-loop.ll @@ -6,13 +6,8 @@ ; RUN: -analyze < %s | FileCheck %s --check-prefix=ALLOWNONAFFINELOOPS ; RUN: opt %loadPolly -polly-detect -polly-allow-nonaffine-branches \ ; RUN: -polly-allow-nonaffine-loops=true -polly-allow-nonaffine \ -; RUN: -polly-detect-unprofitable -analyze < %s | FileCheck %s \ +; RUN: -analyze < %s | FileCheck %s \ ; RUN: --check-prefix=ALLOWNONAFFINELOOPSANDACCESSES -; RUN: opt %loadPolly -polly-detect -polly-allow-nonaffine-branches \ -; RUN: -polly-allow-nonaffine-loops=true -polly-allow-nonaffine \ -; RUN: -polly-detect-scops-in-regions-without-loops \ -; RUN: -polly-detect-unprofitable -analyze < %s | FileCheck %s \ -; RUN: --check-prefix=ALLOWNONAFFINELOOPSANDACCESSESANDNOLOOPS ; ; This function/region does contain a loop, however it is non-affine, hence the access ; A[i] is also. Furthermore, it is the only loop, thus when we over approximate @@ -27,7 +22,6 @@ ; REJECTNONAFFINELOOPS-NOT: Valid ; ALLOWNONAFFINELOOPS-NOT: Valid ; ALLOWNONAFFINELOOPSANDACCESSES-NOT: Valid -; ALLOWNONAFFINELOOPSANDACCESSESANDNOLOOPS: Valid Region for Scop: bb1 => bb10 ; target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" diff --git a/polly/test/ScopDetect/parametric-multiply-in-scev.ll b/polly/test/ScopDetect/parametric-multiply-in-scev.ll index 35f767079b4..76db2d68c74 100644 --- a/polly/test/ScopDetect/parametric-multiply-in-scev.ll +++ b/polly/test/ScopDetect/parametric-multiply-in-scev.ll @@ -1,5 +1,5 @@ -; RUN: opt %loadPolly -polly-detect-unprofitable -polly-detect-scops-in-regions-without-loops -polly-detect-scops-in-functions-without-loops -polly-detect -analyze < %s | FileCheck %s -; RUN: opt %loadPolly -polly-detect-unprofitable -polly-detect-scops-in-regions-without-loops -polly-detect-scops-in-functions-without-loops -polly-detect -analyze < %s | FileCheck %s +; RUN: opt %loadPolly -polly-detect-unprofitable -polly-detect-unprofitable -polly-detect-unprofitable -polly-detect -analyze < %s | FileCheck %s +; RUN: opt %loadPolly -polly-detect-unprofitable -polly-detect-unprofitable -polly-detect-unprofitable -polly-detect -analyze < %s | FileCheck %s ; foo(float *A, long n, long k) { diff --git a/polly/test/ScopDetect/simple_non_single_entry.ll b/polly/test/ScopDetect/simple_non_single_entry.ll index fb354ad493d..62f176b044d 100644 --- a/polly/test/ScopDetect/simple_non_single_entry.ll +++ b/polly/test/ScopDetect/simple_non_single_entry.ll @@ -1,5 +1,5 @@ -; RUN: opt %loadPolly -polly-detect-unprofitable -polly-detect-scops-in-regions-without-loops -polly-detect -analyze < %s | FileCheck %s -; RUN: opt %loadPolly -polly-detect-unprofitable -polly-detect-scops-in-regions-without-loops -polly-detect -analyze < %s | FileCheck %s +; RUN: opt %loadPolly -polly-detect-unprofitable -polly-detect-unprofitable -polly-detect -analyze < %s | FileCheck %s +; RUN: opt %loadPolly -polly-detect-unprofitable -polly-detect-unprofitable -polly-detect -analyze < %s | FileCheck %s ; void f(long A[], long N) { ; long i; diff --git a/polly/test/ScopDetectionDiagnostics/ReportLoopBound-01.ll b/polly/test/ScopDetectionDiagnostics/ReportLoopBound-01.ll index eeb4478d8b0..e479b9bb976 100644 --- a/polly/test/ScopDetectionDiagnostics/ReportLoopBound-01.ll +++ b/polly/test/ScopDetectionDiagnostics/ReportLoopBound-01.ll @@ -1,6 +1,6 @@ ; RUN: opt %loadPolly -polly-detect-unprofitable -pass-remarks-missed="polly-detect" -polly-detect-track-failures -polly-allow-nonaffine-loops=false -polly-detect -analyze < %s 2>&1| FileCheck %s --check-prefix=REJECTNONAFFINELOOPS ; RUN: opt %loadPolly -polly-detect-unprofitable -pass-remarks-missed="polly-detect" -polly-detect-track-failures -polly-allow-nonaffine-loops=true -polly-detect -analyze < %s 2>&1| FileCheck %s --check-prefix=ALLOWNONAFFINELOOPS -; RUN: opt %loadPolly -polly-detect-unprofitable -pass-remarks-missed="polly-detect" -polly-detect-track-failures -polly-allow-nonaffine-loops=true -polly-allow-nonaffine -polly-detect -analyze < %s 2>&1| FileCheck %s --check-prefix=ALLOWNONAFFINEALL +; RUN: opt %loadPolly -pass-remarks-missed="polly-detect" -polly-detect-track-failures -polly-allow-nonaffine-loops=true -polly-allow-nonaffine -polly-detect -analyze < %s 2>&1| FileCheck %s --check-prefix=ALLOWNONAFFINEALL ; void f(int A[], int n) { ; for (int i = 0; i < A[n]; i++) diff --git a/polly/test/ScopInfo/cfg_consequences.ll b/polly/test/ScopInfo/cfg_consequences.ll index dd51038a557..e7eebd50d5a 100644 --- a/polly/test/ScopInfo/cfg_consequences.ll +++ b/polly/test/ScopInfo/cfg_consequences.ll @@ -1,4 +1,4 @@ -; RUN: opt %loadPolly -analyze -polly-scops -polly-detect-scops-in-functions-without-loops -polly-detect-scops-in-regions-without-loops -polly-detect-unprofitable < %s | FileCheck %s +; RUN: opt %loadPolly -analyze -polly-scops -polly-detect-unprofitable -polly-detect-unprofitable -polly-detect-unprofitable < %s | FileCheck %s ; ; void consequences(int *A, int bool_cond, int lhs, int rhs) { ; |
