From: Siddharth Bhat Date: Fri, 28 Jul 2017 11:47:24 +0000 (+0000) Subject: [ScopDetect] add `-polly-ignore-func` flag to ignore functions by name. X-Git-Tag: llvmorg-6.0.0-rc1~11518 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0a1177b58e50c937e00fcb0e38f2b84b98acfed3;p=platform%2Fupstream%2Fllvm.git [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 llvm-svn: 309377 --- diff --git a/polly/lib/Analysis/ScopDetection.cpp b/polly/lib/Analysis/ScopDetection.cpp index cb223d9..4039811 100644 --- a/polly/lib/Analysis/ScopDetection.cpp +++ b/polly/lib/Analysis/ScopDetection.cpp @@ -99,6 +99,14 @@ static cl::list OnlyFunctions( "ANY of the regexes provided."), cl::ZeroOrMore, cl::CommaSeparated, cl::cat(PollyCategory)); +static cl::list 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 AllowFullFunction("polly-detect-full-functions", cl::desc("Allow the detection of full functions"), @@ -274,16 +282,19 @@ void DiagnosticScopFound::print(DiagnosticPrinter &DP) const { 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 &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, const DominatorTree &DT, 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)) diff --git a/polly/test/ScopDetect/ignore_func_flag_regex.ll b/polly/test/ScopDetect/ignore_func_flag_regex.ll new file mode 100644 index 0000000..824cd40 --- /dev/null +++ b/polly/test/ScopDetect/ignore_func_flag_regex.ll @@ -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 +} +