commit 482550a36d0467dc769133c24fd2bf08030ce505
author David Neto <dneto@google.com> Sat Mar 24 05:21:07 2018 -0700
committer David Neto <dneto@google.com> Sun Apr 01 12:32:09 2018 -0400
tree 15b912a40ea8d1444c09e41d0b7ab2aaf7ea0059
parent e439d70a2e218733e25108a3660d758f166b0c48

Centralize some command line options.

lib/ClusterPodKernelArgumentsPass.cpp

diff --git a/lib/ClusterPodKernelArgumentsPass.cpp b/lib/ClusterPodKernelArgumentsPass.cpp
index e60ea83..267a940 100644
--- a/lib/ClusterPodKernelArgumentsPass.cpp
+++ b/lib/ClusterPodKernelArgumentsPass.cpp
@@ -44,12 +44,6 @@
 
 #define DEBUG_TYPE "clusterpodkernelargs"
 
-// TODO(dneto): Remove this after experimentation.
-static llvm::cl::opt<bool> no_inline_pod_fn(
-    "no-inline-pod-inner-function", llvm::cl::init(false),
-    llvm::cl::desc("DEPRECATED. Avoid inlining the inner function created by "
-                   "clustering pod kernel args"));
-
 namespace {
 struct ClusterPodKernelArgumentsPass : public ModulePass {
   static char ID;
@@ -260,11 +254,10 @@
     Builder.CreateRetVoid();
   }
 
-  if (!no_inline_pod_fn) {
-    for (CallInst *C : CallList) {
-      InlineFunctionInfo info;
-      Changed |= InlineFunction(C, info);
-    }
+  // Inline the inner function.  It's cleaner to do this.
+  for (CallInst *C : CallList) {
+    InlineFunctionInfo info;
+    Changed |= InlineFunction(C, info);
   }
 
   return Changed;