From 7d7814027882a5bccdfbf8295258d3627d690233 Mon Sep 17 00:00:00 2001
From: Sanjay Patel <spatel@rotateright.com>
Date: Wed, 14 Apr 2021 08:48:47 -0400
Subject: [PATCH] [ValueTracking] match negative-stepping non-zero recurrence

This is pulled out of D100408.

This avoids a regression that would be exposed by making the
calling code from InstSimplify more efficient.
---
 lib/Analysis/ValueTracking.cpp           | 11 +++++++----
 unittests/Analysis/ValueTrackingTest.cpp |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/Analysis/ValueTracking.cpp b/lib/Analysis/ValueTracking.cpp
index 2d933489447..d78acdbb1cd 100644
--- a/lib/Analysis/ValueTracking.cpp
+++ b/lib/Analysis/ValueTracking.cpp
@@ -2213,8 +2213,8 @@ static bool rangeMetadataExcludesValue(const MDNode* Ranges, const APInt& Value)
   return true;
 }
 
-/// Try to detect a recurrence that monotonically increases from a non-zero
-/// starting value. These are common as induction variables.
+/// Try to detect a recurrence that monotonically increases/decreases from a
+/// non-zero starting value. These are common as induction variables.
 static bool isNonZeroRecurrence(const PHINode *PN) {
   BinaryOperator *BO = nullptr;
   Value *Start = nullptr, *Step = nullptr;
@@ -2225,10 +2225,13 @@ static bool isNonZeroRecurrence(const PHINode *PN) {
 
   switch (BO->getOpcode()) {
   case Instruction::Add:
+    // Starting from non-zero and stepping away from zero can never wrap back
+    // to zero.
+    // TODO: The constant step requirement is not needed with NUW.
     return match(Step, m_APInt(StepC)) &&
            ((BO->hasNoUnsignedWrap() && !StepC->isNullValue()) ||
-            (BO->hasNoSignedWrap() && StartC->isStrictlyPositive() &&
-             StepC->isNonNegative()));
+            (BO->hasNoSignedWrap() &&
+             StartC->isNegative() == StepC->isNegative()));
   case Instruction::Mul:
     return match(Step, m_APInt(StepC)) &&
            ((BO->hasNoUnsignedWrap() && !StepC->isNullValue()) ||
diff --git a/unittests/Analysis/ValueTrackingTest.cpp b/unittests/Analysis/ValueTrackingTest.cpp
index 85678bb6653..99a0f6daa84 100644
--- a/unittests/Analysis/ValueTrackingTest.cpp
+++ b/unittests/Analysis/ValueTrackingTest.cpp
@@ -1191,7 +1191,7 @@ TEST_F(ValueTrackingTest, isNonZeroRecurrence) {
   )");
   DataLayout DL = M->getDataLayout();
   AssumptionCache AC(*F);
-  EXPECT_FALSE(isKnownNonZero(A, DL, 0, &AC, CxtI));
+  EXPECT_TRUE(isKnownNonZero(A, DL, 0, &AC, CxtI));
 }
 
 TEST_F(ValueTrackingTest, KnownNonZeroFromDomCond) {