[llvm-branch-commits] [polly] r304213 - Merging r296994:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Tue May 30 09:51:27 2017
New Revision: 304213

URL: http://llvm.org/viewvc/llvm-project?rev=304213&view=rev
Log:
Merging r296994:

------------------------------------------------------------------------
r296994 | sanjoy | 2017-03-05 20:12:16 -0500 (Sun, 05 Mar 2017) | 10 lines

Adapt to llvm change r296992 to unbreak the bots

r296992 made ScalarEvolution's CompareValueComplexity less aggressive,
and that broke the polly test being fixed in this change.  This change
explicitly bumps CompareValueComplexity in said test case to make it
pass.

Can someone from the polly team please can give me an idea on if this
case is important enough to have
scalar-evolution-max-value-compare-depth be 3 by default?
------------------------------------------------------------------------

Modified:
    polly/branches/release_40/test/ScopInfo/invariant_load_zext_parameter-2.ll

Modified: polly/branches/release_40/test/ScopInfo/invariant_load_zext_parameter-2.ll
URL: http://llvm.org/viewvc/llvm-project/polly/branches/release_40/test/ScopInfo/invariant_load_zext_parameter-2.ll?rev=304213&r1=304212&r2=304213&view=diff
==============================================================================
--- polly/branches/release_40/test/ScopInfo/invariant_load_zext_parameter-2.ll (original)
+++ polly/branches/release_40/test/ScopInfo/invariant_load_zext_parameter-2.ll Tue May 30 09:51:27 2017
@@ -1,5 +1,5 @@
-; RUN: opt %loadPolly -polly-scops -polly-invariant-load-hoisting=true -analyze < %s | FileCheck %s
-; RUN: opt %loadPolly -polly-codegen -polly-invariant-load-hoisting=true -analyze < %s
+; RUN: opt %loadPolly -scalar-evolution-max-value-compare-depth=3 -polly-scops -polly-invariant-load-hoisting=true -analyze < %s | FileCheck %s
+; RUN: opt %loadPolly -scalar-evolution-max-value-compare-depth=3 -polly-codegen -polly-invariant-load-hoisting=true -analyze < %s
 ;
 ; Stress test for the code generation of invariant accesses.
 ;