[polly] r308875 - [Polly] [NFC] [ScopDetection] Make `polly-only-func` perform regex scop name match.
Siddharth Bhat via llvm-commits
llvm-commits at lists.llvm.org
Mon Jul 24 05:40:52 PDT 2017
Author: bollu
Date: Mon Jul 24 05:40:52 2017
New Revision: 308875
URL: http://llvm.org/viewvc/llvm-project?rev=308875&view=rev
Log:
[Polly] [NFC] [ScopDetection] Make `polly-only-func` perform regex scop name match.
Summary:
- We were using `.count` in `StringRef`, which matches substrings.
- We may want to use this for equality as well.
- Generalise this, so allow regexes as a parameter to `polly-only-func`.
Differential Revision: https://reviews.llvm.org/D35728
Added:
polly/trunk/test/ScopDetect/only_func_flag_regex.ll
Modified:
polly/trunk/lib/Analysis/ScopDetection.cpp
Modified: polly/trunk/lib/Analysis/ScopDetection.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopDetection.cpp?rev=308875&r1=308874&r2=308875&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/ScopDetection.cpp (original)
+++ polly/trunk/lib/Analysis/ScopDetection.cpp Mon Jul 24 05:40:52 2017
@@ -64,6 +64,7 @@
#include "llvm/IR/IntrinsicInst.h"
#include "llvm/IR/LLVMContext.h"
#include "llvm/Support/Debug.h"
+#include "llvm/Support/Regex.h"
#include <set>
#include <stack>
@@ -92,10 +93,10 @@ static cl::opt<bool, true> XPollyProcess
static cl::list<std::string> OnlyFunctions(
"polly-only-func",
- cl::desc("Only run on functions that contain a certain string. "
- "Multiple strings can be comma separated. "
- "Scop detection will run on all functions that contain "
- "any of the strings provided."),
+ cl::desc("Only run on functions that match a regex. "
+ "Multiple regexes can be comma separated. "
+ "Scop detection will run on all functions that match "
+ "ANY of the regexes provided."),
cl::ZeroOrMore, cl::CommaSeparated, cl::cat(PollyCategory));
static cl::opt<bool>
@@ -274,9 +275,17 @@ void DiagnosticScopFound::print(Diagnost
}
static bool IsFnNameListedInOnlyFunctions(StringRef FnName) {
- for (auto Name : OnlyFunctions)
- if (FnName.count(Name) > 0)
+ for (auto RegexStr : OnlyFunctions) {
+ Regex R(RegexStr);
+
+ std::string Err;
+ if (!R.isValid(Err))
+ report_fatal_error(
+ "invalid regex given as input to -polly-only-func. " + Err, true);
+
+ if (R.match(FnName))
return true;
+ }
return false;
}
//===----------------------------------------------------------------------===//
Added: polly/trunk/test/ScopDetect/only_func_flag_regex.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopDetect/only_func_flag_regex.ll?rev=308875&view=auto
==============================================================================
--- polly/trunk/test/ScopDetect/only_func_flag_regex.ll (added)
+++ polly/trunk/test/ScopDetect/only_func_flag_regex.ll Mon Jul 24 05:40:52 2017
@@ -0,0 +1,130 @@
+; RUN: opt %loadPolly -polly-scops -analyze -polly-only-func=f.*,g.* < %s | FileCheck %s
+;
+; Check that the flag `-polly-only-func` works with regexes.
+;
+; CHECK: Function: f1
+; CHECK-NEXT: Region: %for.cond---%for.end
+;
+; CHECK: Function: f2
+; CHECK-NEXT: Region: %for.cond---%for.end
+;
+; CHECK: Function: g1
+; CHECK-NEXT: Region: %for.cond---%for.end
+;
+; CHECK-NOT: Function: h
+;
+; void f1(int* sum) {
+; for (int i = 0; i <= 100; i++)
+; sum += i * 3;
+; }
+; void f2(int* sum) {
+; for (int i = 0; i <= 100; i++)
+; sum += i * 3;
+; }
+; void g1(int* sum) {
+; for (int i = 0; i <= 100; i++)
+; sum += i * 3;
+; }
+; void h(int* sum) {
+; for (int i = 0; i <= 100; i++)
+; sum += i * 3;
+; }
+target datalayout = "e-m:e-p:32:32-i64:64-v128:64:128-n32-S64"
+
+define void @f1(i32* %sum) {
+entry:
+ br label %entry.split1
+
+entry.split1: ; preds = %entry
+ br label %entry.split
+
+entry.split: ; preds = %entry.split1
+ br label %for.cond
+
+for.cond: ; preds = %for.cond, %entry.split
+ %i1.0 = phi i32 [ 0, %entry.split ], [ %inc, %for.cond ]
+ %sum.reload = load i32, i32* %sum
+ %mul = mul nsw i32 %i1.0, 3
+ %add = add nsw i32 %sum.reload, %mul
+ %inc = add nsw i32 %i1.0, 1
+ store i32 %add, i32* %sum
+ %cmp = icmp slt i32 %i1.0, 100
+ br i1 %cmp, label %for.cond, label %for.end
+
+for.end: ; preds = %for.cond
+ ret void
+}
+
+
+define void @f2(i32* %sum) {
+entry:
+ br label %entry.split1
+
+entry.split1: ; preds = %entry
+ br label %entry.split
+
+entry.split: ; preds = %entry.split1
+ br label %for.cond
+
+for.cond: ; preds = %for.cond, %entry.split
+ %i1.0 = phi i32 [ 0, %entry.split ], [ %inc, %for.cond ]
+ %sum.reload = load i32, i32* %sum
+ %mul = mul nsw i32 %i1.0, 3
+ %add = add nsw i32 %sum.reload, %mul
+ %inc = add nsw i32 %i1.0, 1
+ store i32 %add, i32* %sum
+ %cmp = icmp slt i32 %i1.0, 100
+ br i1 %cmp, label %for.cond, label %for.end
+
+for.end: ; preds = %for.cond
+ ret void
+}
+
+define void @g1(i32* %sum) {
+entry:
+ br label %entry.split1
+
+entry.split1: ; preds = %entry
+ br label %entry.split
+
+entry.split: ; preds = %entry.split1
+ br label %for.cond
+
+for.cond: ; preds = %for.cond, %entry.split
+ %i1.0 = phi i32 [ 0, %entry.split ], [ %inc, %for.cond ]
+ %sum.reload = load i32, i32* %sum
+ %mul = mul nsw i32 %i1.0, 3
+ %add = add nsw i32 %sum.reload, %mul
+ %inc = add nsw i32 %i1.0, 1
+ store i32 %add, i32* %sum
+ %cmp = icmp slt i32 %i1.0, 100
+ br i1 %cmp, label %for.cond, label %for.end
+
+for.end: ; preds = %for.cond
+ ret void
+}
+
+define void @h(i32* %sum) {
+entry:
+ br label %entry.split1
+
+entry.split1: ; preds = %entry
+ br label %entry.split
+
+entry.split: ; preds = %entry.split1
+ br label %for.cond
+
+for.cond: ; preds = %for.cond, %entry.split
+ %i1.0 = phi i32 [ 0, %entry.split ], [ %inc, %for.cond ]
+ %sum.reload = load i32, i32* %sum
+ %mul = mul nsw i32 %i1.0, 3
+ %add = add nsw i32 %sum.reload, %mul
+ %inc = add nsw i32 %i1.0, 1
+ store i32 %add, i32* %sum
+ %cmp = icmp slt i32 %i1.0, 100
+ br i1 %cmp, label %for.cond, label %for.end
+
+for.end: ; preds = %for.cond
+ ret void
+}
+
More information about the llvm-commits
mailing list