Commit a6c8e27b authored by Philip Reames's avatar Philip Reames Committed by Philip Reames
Browse files

[IndVars] Generate zext nneg when locally obvious 

zext nneg was recently added to the IR in #67982.  This patch teaches
SimplifyIndVars to prefer zext nneg over *both* sext and plain zext,
when a local SCEV query indicates the source is non-negative.

The choice to prefer zext nneg over sext looks slightly aggressive
here, but probably isn't so much in practice.  For cases where we'd
"remember" the range fact, instcombine would convert the sext into
a zext nneg anyways.  The only cases where this produces a different
result overall are when SCEV knows a non-local fact, and it doesn't
get materialized into the IR.  Those are exactly the cases where
using zext nneg are most useful.  We do run the risk of e.g. a
missing combine - since we haven't updated most of them yet - but
that seems like a manageable risk.

Note that there are much deeper algorithmic changes we could make
to this code to exploit zext nneg, but this seemed like a reasonable
and low risk starting point.
parent 1e39575a

llvm/lib/Transforms/Utils/SimplifyIndVar.cpp

+19 −0
Original line number Diff line number Diff line
@@ -1201,6 +1201,15 @@ Value *WidenIV::createExtendInst(Value *NarrowOper, Type *WideType, 
       L = L->getParentLoop())

    Builder.SetInsertPoint(L->getLoopPreheader()->getTerminator());



  // If we know the operand is never negative, prefer zext nneg.

  // For constant expressions, fall back to plain sext or zext.

  if (SE->isKnownNonNegative(SE->getSCEV(NarrowOper))) {

    auto *Res = Builder.CreateZExt(NarrowOper, WideType);

    if (auto *I = dyn_cast<Instruction>(Res))

      I->setNonNeg(true);

    return Res;

  }



  return IsSigned ? Builder.CreateSExt(NarrowOper, WideType) :

                    Builder.CreateZExt(NarrowOper, WideType);

}
@@ -1686,6 +1695,16 @@ bool WidenIV::widenWithVariantUse(WidenIV::NarrowIVDefUse DU) { 
    auto ExtendedOp = [&](Value * V)->Value * {

      if (V == NarrowUse)

        return WideBO;



      // If we know the operand is never negative, prefer zext nneg.

      // For constant expressions, fall back to plain sext or zext.

      if (SE->isKnownNonNegative(SE->getSCEV(V))) {

        auto *Res = Builder.CreateZExt(V, WideBO->getType());

        if (auto *I = dyn_cast<Instruction>(Res))

          I->setNonNeg(true);

        return Res;

      }



      if (ExtKind == ExtendKind::Zero)

        return Builder.CreateZExt(V, WideBO->getType());

      else

llvm/test/Analysis/ScalarEvolution/guards.ll

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ define void @test_2(i32 %n, ptr %len_buf) { 
; CHECK-SAME: (i32 [[N:%.*]], ptr [[LEN_BUF:%.*]]) {

; CHECK-NEXT:  entry:

; CHECK-NEXT:    [[LEN:%.*]] = load i32, ptr [[LEN_BUF]], align 4, !range [[RNG1:![0-9]+]]

; CHECK-NEXT:    [[TMP0:%.*]] = zext i32 [[LEN]] to i64

; CHECK-NEXT:    [[TMP0:%.*]] = zext nneg i32 [[LEN]] to i64

; CHECK-NEXT:    [[TMP1:%.*]] = zext i32 [[N]] to i64

; CHECK-NEXT:    br label [[LOOP:%.*]]

; CHECK:       loop:

llvm/test/Transforms/IndVarSimplify/X86/pr59615.ll

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ define void @test() { 
; CHECK-NEXT:    ret void

; CHECK:       bb8:

; CHECK-NEXT:    [[VAR9:%.*]] = load atomic i32, ptr addrspace(1) poison unordered, align 8, !range [[RNG0]], !invariant.load !1, !noundef !1

; CHECK-NEXT:    [[TMP0:%.*]] = zext i32 [[VAR9]] to i64

; CHECK-NEXT:    [[TMP0:%.*]] = zext nneg i32 [[VAR9]] to i64

; CHECK-NEXT:    [[VAR10:%.*]] = icmp ult i64 [[INDVARS_IV]], [[TMP0]]

; CHECK-NEXT:    br i1 [[VAR10]], label [[BB12]], label [[BB11:%.*]]

; CHECK:       bb11:

llvm/test/Transforms/IndVarSimplify/post-inc-range.ll

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ define void @test_range_metadata(ptr %array_length_ptr, ptr %base, 
; CHECK:       for.body:

; CHECK-NEXT:    [[INDVARS_IV:%.*]] = phi i64 [ [[INDVARS_IV_NEXT:%.*]], [[FOR_INC:%.*]] ], [ [[TMP0]], [[FOR_BODY_LR_PH:%.*]] ]

; CHECK-NEXT:    [[ARRAY_LENGTH:%.*]] = load i32, ptr [[ARRAY_LENGTH_PTR:%.*]], align 4, !range [[RNG0:![0-9]+]]

; CHECK-NEXT:    [[TMP2:%.*]] = zext i32 [[ARRAY_LENGTH]] to i64

; CHECK-NEXT:    [[TMP2:%.*]] = zext nneg i32 [[ARRAY_LENGTH]] to i64

; CHECK-NEXT:    [[WITHIN_LIMITS:%.*]] = icmp ult i64 [[INDVARS_IV]], [[TMP2]]

; CHECK-NEXT:    br i1 [[WITHIN_LIMITS]], label [[CONTINUE:%.*]], label [[FOR_END:%.*]]

; CHECK:       continue:

llvm/test/Transforms/LoopFlatten/widen-iv2.ll

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ define dso_local i32 @fn1() local_unnamed_addr #0 { 
; CHECK-NEXT:    [[INDVAR:%.*]] = phi i64 [ [[INDVAR_NEXT:%.*]], [[FOR_BODY3_US]] ], [ 0, [[FOR_COND1_PREHEADER_US]] ]

; CHECK-NEXT:    [[J_014_US:%.*]] = phi i32 [ 0, [[FOR_COND1_PREHEADER_US]] ], [ [[INC_US:%.*]], [[FOR_BODY3_US]] ]

; CHECK-NEXT:    [[TMP7:%.*]] = add nsw i64 [[INDVAR]], [[TMP5]]

; CHECK-NEXT:    [[TMP8:%.*]] = sext i32 [[J_014_US]] to i64

; CHECK-NEXT:    [[TMP8:%.*]] = zext nneg i32 [[J_014_US]] to i64

; CHECK-NEXT:    [[TMP9:%.*]] = add nsw i64 [[TMP8]], [[TMP5]]

; CHECK-NEXT:    [[ADD_US:%.*]] = add nsw i32 [[J_014_US]], [[MUL_US]]

; CHECK-NEXT:    [[IDXPROM_US:%.*]] = sext i32 [[ADD_US]] to i64