From 286c916dde2ba341b7442b3433c6f07fea37fd65 Mon Sep 17 00:00:00 2001 From: Siddharth Bhat Date: Fri, 9 Jun 2017 08:23:40 +0000 Subject: [PATCH] [Polly] [ScopDetection] Allow passing multiple functions to `-polly-only-func`. - This is useful to run optimisations on only certain functions. Differential Revision: https://reviews.llvm.org/D33990 llvm-svn: 305060 --- polly/lib/Analysis/ScopDetection.cpp | 18 +++-- polly/test/ScopDetect/only_func_flag.ll | 100 ++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 5 deletions(-) create mode 100644 polly/test/ScopDetect/only_func_flag.ll diff --git a/polly/lib/Analysis/ScopDetection.cpp b/polly/lib/Analysis/ScopDetection.cpp index 0d364145d309..9aa13b49279f 100644 --- a/polly/lib/Analysis/ScopDetection.cpp +++ b/polly/lib/Analysis/ScopDetection.cpp @@ -90,11 +90,13 @@ static cl::opt XPollyProcessUnprofitable( cl::location(PollyProcessUnprofitable), cl::init(false), cl::ZeroOrMore, cl::cat(PollyCategory)); -static cl::opt OnlyFunction( +static cl::list OnlyFunctions( "polly-only-func", - cl::desc("Only run on functions that contain a certain string"), - cl::value_desc("string"), cl::ValueRequired, cl::init(""), - cl::cat(PollyCategory)); + 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::ZeroOrMore, cl::CommaSeparated, cl::cat(PollyCategory)); static cl::opt AllowFullFunction("polly-detect-full-functions", @@ -271,6 +273,12 @@ void DiagnosticScopFound::print(DiagnosticPrinter &DP) const { DP << FileName << ":" << ExitLine << ": End of scop"; } +static bool IsFnNameListedInOnlyFunctions(StringRef FnName) { + for (auto Name : OnlyFunctions) + if (FnName.count(Name) > 0) + return true; + return false; +} //===----------------------------------------------------------------------===// // ScopDetection. @@ -284,7 +292,7 @@ ScopDetection::ScopDetection(Function &F, const DominatorTree &DT, Region *TopRegion = RI.getTopLevelRegion(); - if (OnlyFunction != "" && !F.getName().count(OnlyFunction)) + if (OnlyFunctions.size() > 0 && !IsFnNameListedInOnlyFunctions(F.getName())) return; if (!isValidFunction(F)) diff --git a/polly/test/ScopDetect/only_func_flag.ll b/polly/test/ScopDetect/only_func_flag.ll new file mode 100644 index 000000000000..4a070a64088c --- /dev/null +++ b/polly/test/ScopDetect/only_func_flag.ll @@ -0,0 +1,100 @@ +; RUN: opt %loadPolly -polly-scops -analyze -polly-only-func=f,g < %s | FileCheck %s +; +; Check that the flag `-polly-only-func` limits analysis to `f` and `g`. +; +; CHECK: Function: f +; CHECK-NEXT: Region: %for.cond---%for.end +; +; CHECK: Function: g +; CHECK-NEXT: Region: %for.cond---%for.end +; +; CHECK-NOT: Function: h +; +; void f(int* sum) { +; for (int i = 0; i <= 100; i++) +; sum += i * 3; +; } +; void g(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 @f(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 @g(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 +} +