[llvm-branch-commits] [llvm-branch] r276647 - Merging r276479:

[Robinson, Paul via llvm-branch-commits]

Hans, it looks like this merge is incomplete--the trunk patch
also modified test/Feature/optnone-opt.ll and that isn't reflected
in the branch.  We have a 3.9 bot already running and it caught
this.

(Removing the test for GVN Hoisting isn't actually the best tactic
here, I'll fix that on trunk after I get some sleep.)
Thanks,
--paulr

> -----Original Message-----
> From: llvm-branch-commits [mailto:llvm-branch-commits-
> bounces at lists.llvm.org] On Behalf Of Hans Wennborg via llvm-branch-commits
> Sent: Monday, July 25, 2016 9:38 AM
> To: llvm-branch-commits at lists.llvm.org
> Subject: [llvm-branch-commits] [llvm-branch] r276647 - Merging r276479:
> 
> Author: hans
> Date: Mon Jul 25 11:37:31 2016
> New Revision: 276647
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=276647&view=rev
> Log:
> Merging r276479:
> ------------------------------------------------------------------------
> r276479 | asbirlea | 2016-07-22 15:02:19 -0700 (Fri, 22 Jul 2016) | 11
> lines
> 
> Add flag to PassManagerBuilder to disable GVN Hoist Pass.
> 
> Summary:
> Adding a flag to diable GVN Hoisting by default.
> Note: The GVN Hoist Pass causes some Halide tests to hang. Halide will
> disable the pass while investigating.
> 
> Reviewers: llvm-commits, chandlerc, spop, dberlin
> 
> Subscribers: mehdi_amini
> 
> Differential Revision: https://reviews.llvm.org/D22639
> ------------------------------------------------------------------------
> 
> Modified:
>     llvm/branches/release_39/   (props changed)
>     llvm/branches/release_39/lib/Transforms/IPO/PassManagerBuilder.cpp
> 
> Propchange: llvm/branches/release_39/
> --------------------------------------------------------------------------
> ----
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Mon Jul 25 11:37:31 2016
> @@ -1,3 +1,3 @@
>  /llvm/branches/Apple/Pertwee:110850,110961
>  /llvm/branches/type-system-rewrite:133420-134817
> -
> /llvm/trunk:155241,275870,275879,275898,275935,275946,276181,276358,276364
> ,276368
> +/llvm/trunk:155241,275870,275879,275898,275935,275946,276181,276358,27636
> 4,276368,276479
> 
> Modified:
> llvm/branches/release_39/lib/Transforms/IPO/PassManagerBuilder.cpp
> URL: http://llvm.org/viewvc/llvm-
> project/llvm/branches/release_39/lib/Transforms/IPO/PassManagerBuilder.cpp
> ?rev=276647&r1=276646&r2=276647&view=diff
> ==========================================================================
> ====
> --- llvm/branches/release_39/lib/Transforms/IPO/PassManagerBuilder.cpp
> (original)
> +++ llvm/branches/release_39/lib/Transforms/IPO/PassManagerBuilder.cpp Mon
> Jul 25 11:37:31 2016
> @@ -134,6 +134,10 @@ static cl::opt<int> PreInlineThreshold(
>      cl::desc("Control the amount of inlining in pre-instrumentation
> inliner "
>               "(default = 75)"));
> 
> +static cl::opt<bool> EnableGVNHoist(
> +    "enable-gvn-hoist", cl::init(false), cl::Hidden,
> +    cl::desc("Enable the experimental GVN Hoisting pass"));
> +
>  PassManagerBuilder::PassManagerBuilder() {
>      OptLevel = 2;
>      SizeLevel = 0;
> @@ -232,7 +236,8 @@ void PassManagerBuilder::populateFunctio
>    FPM.add(createCFGSimplificationPass());
>    FPM.add(createSROAPass());
>    FPM.add(createEarlyCSEPass());
> -  FPM.add(createGVNHoistPass());
> +  if(EnableGVNHoist)
> +    FPM.add(createGVNHoistPass());
>    FPM.add(createLowerExpectIntrinsicPass());
>  }
> 
> 
> 
> _______________________________________________
> llvm-branch-commits mailing list
> llvm-branch-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits