[polly] r330285 - [ScopDetect / ScopInfo] Get statistics for scops without any loop correctly
Tobias Grosser via llvm-commits
llvm-commits at lists.llvm.org
Wed Apr 18 13:03:36 PDT 2018
Author: grosser
Date: Wed Apr 18 13:03:36 2018
New Revision: 330285
URL: http://llvm.org/viewvc/llvm-project?rev=330285&view=rev
Log:
[ScopDetect / ScopInfo] Get statistics for scops without any loop correctly
Make sure we also counts scops not containing any loops.
Modified:
polly/trunk/lib/Analysis/ScopDetection.cpp
polly/trunk/lib/Analysis/ScopInfo.cpp
polly/trunk/test/ScopDetect/statistics.ll
Modified: polly/trunk/lib/Analysis/ScopDetection.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopDetection.cpp?rev=330285&r1=330284&r2=330285&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/ScopDetection.cpp (original)
+++ polly/trunk/lib/Analysis/ScopDetection.cpp Wed Apr 18 13:03:36 2018
@@ -251,6 +251,7 @@ StringRef polly::PollySkipFnAttr = "poll
STATISTIC(NumScopRegions, "Number of scops");
STATISTIC(NumLoopsInScop, "Number of loops in scops");
+STATISTIC(NumScopsDepthZero, "Number of scops with maximal loop depth 0");
STATISTIC(NumScopsDepthOne, "Number of scops with maximal loop depth 1");
STATISTIC(NumScopsDepthTwo, "Number of scops with maximal loop depth 2");
STATISTIC(NumScopsDepthThree, "Number of scops with maximal loop depth 3");
@@ -262,6 +263,8 @@ STATISTIC(NumProfScopRegions, "Number of
STATISTIC(NumLoopsInProfScop,
"Number of loops in scops (profitable scops only)");
STATISTIC(NumLoopsOverall, "Number of total loops");
+STATISTIC(NumProfScopsDepthZero,
+ "Number of scops with maximal loop depth 0 (profitable scops only)");
STATISTIC(NumProfScopsDepthOne,
"Number of scops with maximal loop depth 1 (profitable scops only)");
STATISTIC(NumProfScopsDepthTwo,
@@ -1757,7 +1760,9 @@ static void updateLoopCountStatistic(Sco
NumLoopsInScop += Stats.NumLoops;
MaxNumLoopsInScop =
std::max(MaxNumLoopsInScop.getValue(), (unsigned)Stats.NumLoops);
- if (Stats.MaxDepth == 1)
+ if (Stats.MaxDepth == 0)
+ NumScopsDepthZero++;
+ else if (Stats.MaxDepth == 1)
NumScopsDepthOne++;
else if (Stats.MaxDepth == 2)
NumScopsDepthTwo++;
@@ -1773,7 +1778,9 @@ static void updateLoopCountStatistic(Sco
NumLoopsInProfScop += Stats.NumLoops;
MaxNumLoopsInProfScop =
std::max(MaxNumLoopsInProfScop.getValue(), (unsigned)Stats.NumLoops);
- if (Stats.MaxDepth == 1)
+ if (Stats.MaxDepth == 0)
+ NumProfScopsDepthZero++;
+ else if (Stats.MaxDepth == 1)
NumProfScopsDepthOne++;
else if (Stats.MaxDepth == 2)
NumProfScopsDepthTwo++;
Modified: polly/trunk/lib/Analysis/ScopInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopInfo.cpp?rev=330285&r1=330284&r2=330285&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/ScopInfo.cpp (original)
+++ polly/trunk/lib/Analysis/ScopInfo.cpp Wed Apr 18 13:03:36 2018
@@ -126,6 +126,7 @@ STATISTIC(NumLoopsInScop, "Number of loo
STATISTIC(NumBoxedLoops, "Number of boxed loops in SCoPs after ScopInfo");
STATISTIC(NumAffineLoops, "Number of affine loops in SCoPs after ScopInfo");
+STATISTIC(NumScopsDepthZero, "Number of scops with maximal loop depth 0");
STATISTIC(NumScopsDepthOne, "Number of scops with maximal loop depth 1");
STATISTIC(NumScopsDepthTwo, "Number of scops with maximal loop depth 2");
STATISTIC(NumScopsDepthThree, "Number of scops with maximal loop depth 3");
@@ -5001,7 +5002,9 @@ void updateLoopCountStatistic(ScopDetect
MaxNumLoopsInScop =
std::max(MaxNumLoopsInScop.getValue(), (unsigned)Stats.NumLoops);
- if (Stats.MaxDepth == 1)
+ if (Stats.MaxDepth == 0)
+ NumScopsDepthZero++;
+ else if (Stats.MaxDepth == 1)
NumScopsDepthOne++;
else if (Stats.MaxDepth == 2)
NumScopsDepthTwo++;
Modified: polly/trunk/test/ScopDetect/statistics.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopDetect/statistics.ll?rev=330285&r1=330284&r2=330285&view=diff
==============================================================================
--- polly/trunk/test/ScopDetect/statistics.ll (original)
+++ polly/trunk/test/ScopDetect/statistics.ll Wed Apr 18 13:03:36 2018
@@ -7,17 +7,24 @@
; CHECK-DAG: 11 polly-detect - Number of loops in scops (profitable scops only)
; CHECK-DAG: 11 polly-detect - Number of loops in scops
; CHECK-DAG: 11 polly-detect - Number of total loops
-; CHECK-DAG: 5 polly-detect - Number of scops (profitable scops only)
+; CHECK-DAG: 6 polly-detect - Number of scops (profitable scops only)
; CHECK-DAG: 1 polly-detect - Number of scops with maximal loop depth 4 (profitable scops only)
; CHECK-DAG: 2 polly-detect - Number of scops with maximal loop depth 1 (profitable scops only)
; CHECK-DAG: 1 polly-detect - Number of scops with maximal loop depth 3 (profitable scops only)
; CHECK-DAG: 1 polly-detect - Number of scops with maximal loop depth 2 (profitable scops only)
-; CHECK-DAG: 5 polly-detect - Number of scops
+; CHECK-DAG: 1 polly-detect - Number of scops with maximal loop depth 0 (profitable scops only)
+; CHECK-DAG: 6 polly-detect - Number of scops
; CHECK-DAG: 1 polly-detect - Number of scops with maximal loop depth 4
; CHECK-DAG: 2 polly-detect - Number of scops with maximal loop depth 1
; CHECK-DAG: 1 polly-detect - Number of scops with maximal loop depth 3
; CHECK-DAG: 1 polly-detect - Number of scops with maximal loop depth 2
+; CHECK-DAG: 1 polly-detect - Number of scops with maximal loop depth 0
+; void foo_0d(float *A) {
+; if (true)
+; A[0] += i;
+; }
+;
; void foo_1d(float *A) {
; for (long i = 0; i < 1024; i++)
; A[i] += i;
@@ -50,6 +57,21 @@
; }
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+define void @foo_0d(float* %A) {
+bb:
+ br label %bb1
+
+bb1:
+ br i1 true, label %exit, label %block
+
+block:
+ store float 42.0, float* %A
+ br label %exit
+
+exit:
+ ret void
+}
+
define void @foo_1d(float* %A) {
bb:
br label %bb1
More information about the llvm-commits
mailing list