[polly] r309377 - [ScopDetect] add `-polly-ignore-func` flag to ignore functions by name.
Siddharth Bhat via llvm-commits
llvm-commits at lists.llvm.org
Fri Jul 28 04:47:24 PDT 2017
Author: bollu
Date: Fri Jul 28 04:47:24 2017
New Revision: 309377
URL: http://llvm.org/viewvc/llvm-project?rev=309377&view=rev
Log:
[ScopDetect] add `-polly-ignore-func` flag to ignore functions by name.
Ignore all functions whose name match a regex. Useful because creating a
regex that does *not* match a string is somewhat hard.
Example:
https://stackoverflow.com/questions/1240275/how-to-negate-specific-word-in-regex
Added:
polly/trunk/test/ScopDetect/ignore_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=309377&r1=309376&r2=309377&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/ScopDetection.cpp (original)
+++ polly/trunk/lib/Analysis/ScopDetection.cpp Fri Jul 28 04:47:24 2017
@@ -99,6 +99,14 @@ static cl::list<std::string> OnlyFunctio
"ANY of the regexes provided."),
cl::ZeroOrMore, cl::CommaSeparated, cl::cat(PollyCategory));
+static cl::list<std::string> IgnoredFunctions(
+ "polly-ignore-func",
+ cl::desc("Ignore functions that match a regex. "
+ "Multiple regexes can be comma separated. "
+ "Scop detection will ignore all functions that match "
+ "ANY of the regexes provided."),
+ cl::ZeroOrMore, cl::CommaSeparated, cl::cat(PollyCategory));
+
static cl::opt<bool>
AllowFullFunction("polly-detect-full-functions",
cl::desc("Allow the detection of full functions"),
@@ -274,16 +282,19 @@ void DiagnosticScopFound::print(Diagnost
DP << FileName << ":" << ExitLine << ": End of scop";
}
-static bool IsFnNameListedInOnlyFunctions(StringRef FnName) {
- for (auto RegexStr : OnlyFunctions) {
+/// Check if a string matches any regex in a list of regexes.
+/// @param Str the input string to match against.
+/// @param RegexList a list of strings that are regular expressions.
+static bool doesStringMatchAnyRegex(StringRef Str,
+ const cl::list<std::string> &RegexList) {
+ for (auto RegexStr : RegexList) {
Regex R(RegexStr);
std::string Err;
if (!R.isValid(Err))
- report_fatal_error(
- "invalid regex given as input to -polly-only-func. " + Err, true);
+ report_fatal_error("invalid regex given as input to polly: " + Err, true);
- if (R.match(FnName))
+ if (R.match(Str))
return true;
}
return false;
@@ -301,7 +312,11 @@ ScopDetection::ScopDetection(Function &F
Region *TopRegion = RI.getTopLevelRegion();
- if (OnlyFunctions.size() > 0 && !IsFnNameListedInOnlyFunctions(F.getName()))
+ if (OnlyFunctions.size() > 0 &&
+ !doesStringMatchAnyRegex(F.getName(), OnlyFunctions))
+ return;
+
+ if (doesStringMatchAnyRegex(F.getName(), IgnoredFunctions))
return;
if (!isValidFunction(F))
Added: polly/trunk/test/ScopDetect/ignore_func_flag_regex.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopDetect/ignore_func_flag_regex.ll?rev=309377&view=auto
==============================================================================
--- polly/trunk/test/ScopDetect/ignore_func_flag_regex.ll (added)
+++ polly/trunk/test/ScopDetect/ignore_func_flag_regex.ll Fri Jul 28 04:47:24 2017
@@ -0,0 +1,124 @@
+; RUN: opt %loadPolly -polly-scops -analyze -polly-ignore-func=f.*,g.* < %s | FileCheck %s
+;
+; Check that the flag `-polly-ignore-func` works with regexes.
+;
+; CHECK: Function: h
+; CHECK-NEXT: Region: %for.cond---%for.end
+;
+; CHECK-NOT: Function:
+;
+; 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