[Attributor] Add AAValueSimplifyCallSiteArgument::manifest

[okura]

Summary

Value simplification result in AAValueSimplify is sometimes flow-sensitive because of AAConstantRange::getConstantRangeFromLVI,AAConstantRange::getConstantRangeFromSCEV.
But manifestation for callsite argument is done in the same way for the floating position. This causes the following unexpected simplification, for example.
Before:

define i32 @g(i1 %d) {
  br i1 %c, label %t, label %f
t:
  %ret1 = call i32 @f(i1 %c)
  ret i32 %ret1
f:
  %ret2 = call i32 @f(i1 false)
  ret i32 %ret2
}

After:

define i32 @g(i1 %d) {
  br label %t
t:
  %ret1 = call i32 @f(i1 true)
  ret i32 %ret1
f:
  %ret2 = call i32 @f(i1 false)
  ret i32 %ret2
}

This patch fix the problem by replacing use with simplified values in manifestation.

[jdoerfert]

LGTM. One nit

llvm/lib/Transforms/IPO/AttributorAttributes.cpp

4686

Move the U into the conditional or make if (!C) return an early exit.

[okura]

corrected the point.

[jdoerfert]

Can you merge this?

[okura]

fix test

[okura]

In D82861#2137685, @jdoerfert wrote:

Can you merge this?

Do I have a right to merge this by myself? I did arc patch and tried to git push https://github.com/llvm/llvm-project.git HEAD:master according to the document, but I failed to do that.

[sstefan1]

In D82861#2146242, @okura wrote:

In D82861#2137685, @jdoerfert wrote:

Can you merge this?

Do I have a right to merge this by myself? I did arc patch and tried to git push https://github.com/llvm/llvm-project.git HEAD:master according to the document, but I failed to do that.

Did you get the commit access? If so, what problems did you have with git push?

[okura]

In D82861#2146246, @sstefan1 wrote:

In D82861#2146242, @okura wrote:

In D82861#2137685, @jdoerfert wrote:

Can you merge this?

Do I have a right to merge this by myself? I did arc patch and tried to git push https://github.com/llvm/llvm-project.git HEAD:master according to the document, but I failed to do that.

Did you get the commit access? If so, what problems did you have with git push?

I got the following message with git push

remote: Permission to llvm/llvm-project.git denied to okuraofvegetable.
fatal: unable to access 'https://github.com/llvm/llvm-project.git/': The requested URL returned error: 403

From this message, it seems to me that I don't have commit access.

[kuter]

In D82861#2146253, @okura wrote:

In D82861#2146246, @sstefan1 wrote:

In D82861#2146242, @okura wrote:

In D82861#2137685, @jdoerfert wrote:

Can you merge this?

Do I have a right to merge this by myself? I did arc patch and tried to git push https://github.com/llvm/llvm-project.git HEAD:master according to the document, but I failed to do that.

Did you get the commit access? If so, what problems did you have with git push?

I got the following message with git push

remote: Permission to llvm/llvm-project.git denied to okuraofvegetable.
fatal: unable to access 'https://github.com/llvm/llvm-project.git/': The requested URL returned error: 403

From this message, it seems to me that I don't have commit access.

You are not a member of the llvm org in github.
If you asked for commit access you should have received a invite.

If you where it should show up in your github profile
https://github.com/okuraofvegetable

[bbn]

Take a look at this page: https://llvm.org/docs/DeveloperPolicy.html#obtaining-commit-access , you need to send an email to Chris to ask for commit access.

[okura]

Thank you, everyone. I sent a request e-mail.

llvm/lib/Transforms/IPO/AttributorAttributes.cpp

struct AAValueSimplifyCallSiteReturned : AAValueSimplifyReturned {
   void trackStatistics() const override {
     STATS_DECLTRACK_CSRET_ATTR(value_simplify)
   }
 };
 struct AAValueSimplifyCallSiteArgument : AAValueSimplifyFloating {
   AAValueSimplifyCallSiteArgument(const IRPosition &IRP, Attributor &A)
       : AAValueSimplifyFloating(IRP, A) {}
 
+  /// See AbstractAttribute::manifest(...).
+  ChangeStatus manifest(Attributor &A) override {
+    ChangeStatus Changed = ChangeStatus::UNCHANGED;
+
+    if (SimplifiedAssociatedValue.hasValue() &&
+        !SimplifiedAssociatedValue.getValue())
+      return Changed;
+
+    Value &V = getAssociatedValue();
+    auto *C = SimplifiedAssociatedValue.hasValue()
+                  ? dyn_cast<Constant>(SimplifiedAssociatedValue.getValue())
+                  : UndefValue::get(V.getType());
+    if (C) {
+      Use &U = cast<CallBase>(&getAnchorValue())->getArgOperandUse(getArgNo());
+      // We can replace the AssociatedValue with the constant.
+      if (&V != C && V.getType() == C->getType()) {
+        if (A.changeUseAfterManifest(U, *C))
+          Changed = ChangeStatus::CHANGED;
+      }
+    }
+
+    return Changed | AAValueSimplify::manifest(A);
+  }
+
   void trackStatistics() const override {
     STATS_DECLTRACK_CSARG_ATTR(value_simplify)
   }
 };
 
 /// ----------------------- Heap-To-Stack Conversion ---------------------------
 struct AAHeapToStackImpl : public AAHeapToStack {
   AAHeapToStackImpl(const IRPosition &IRP, Attributor &A)

llvm/test/Transforms/Attributor/range.ll

if.false:
   br label %end
 end:
   %phi = phi i32 [ %V, %if.true ], [ %call, %if.false ]
   %c2 = icmp sge i32 %phi, 100
   ret i1 %c2
 }
 
 
+define i32 @func(i1 %c) {
+; CHECK-LABEL: define {{[^@]+}}@func
+; CHECK-SAME: (i1 [[C:%.*]])
+; CHECK-NEXT:    [[RET:%.*]] = select i1 [[C]], i32 0, i32 1
+; CHECK-NEXT:    ret i32 [[RET]]
+;
+  %ret = select i1 %c, i32 0, i32 1
+  ret i32 %ret
+}
+
+define i32 @simplify_callsite_argument(i1 %d) {
+; IS__TUNIT_OPM-LABEL: define {{[^@]+}}@simplify_callsite_argument
+; IS__TUNIT_OPM-SAME: (i1 [[D:%.*]])
+; IS__TUNIT_OPM-NEXT:    [[C:%.*]] = select i1 [[D]], i1 true, i1 false
+; IS__TUNIT_OPM-NEXT:    br i1 [[C]], label [[T:%.*]], label [[F:%.*]]
+; IS__TUNIT_OPM:       t:
+; IS__TUNIT_OPM-NEXT:    [[RET1:%.*]] = call i32 @func(i1 [[C]]) #2, !range !3
+; IS__TUNIT_OPM-NEXT:    ret i32 [[RET1]]
+; IS__TUNIT_OPM:       f:
+; IS__TUNIT_OPM-NEXT:    [[RET2:%.*]] = call i32 @func(i1 false) #2, !range !3
+; IS__TUNIT_OPM-NEXT:    ret i32 [[RET2]]
+;
+; IS__TUNIT_NPM-LABEL: define {{[^@]+}}@simplify_callsite_argument
+; IS__TUNIT_NPM-SAME: (i1 [[D:%.*]])
+; IS__TUNIT_NPM-NEXT:    [[C:%.*]] = select i1 [[D]], i1 true, i1 false
+; IS__TUNIT_NPM-NEXT:    br i1 [[C]], label [[T:%.*]], label [[F:%.*]]
+; IS__TUNIT_NPM:       t:
+; IS__TUNIT_NPM-NEXT:    [[RET1:%.*]] = call i32 @func(i1 true) #1, !range !4
+; IS__TUNIT_NPM-NEXT:    ret i32 [[RET1]]
+; IS__TUNIT_NPM:       f:
+; IS__TUNIT_NPM-NEXT:    [[RET2:%.*]] = call i32 @func(i1 false) #1, !range !4
+; IS__TUNIT_NPM-NEXT:    ret i32 [[RET2]]
+;
+; IS__CGSCC_OPM-LABEL: define {{[^@]+}}@simplify_callsite_argument
+; IS__CGSCC_OPM-SAME: (i1 [[D:%.*]])
+; IS__CGSCC_OPM-NEXT:    [[C:%.*]] = select i1 [[D]], i1 true, i1 false
+; IS__CGSCC_OPM-NEXT:    br i1 [[C]], label [[T:%.*]], label [[F:%.*]]
+; IS__CGSCC_OPM:       t:
+; IS__CGSCC_OPM-NEXT:    [[RET1:%.*]] = call i32 @func(i1 [[C]])
+; IS__CGSCC_OPM-NEXT:    ret i32 [[RET1]]
+; IS__CGSCC_OPM:       f:
+; IS__CGSCC_OPM-NEXT:    [[RET2:%.*]] = call i32 @func(i1 false)
+; IS__CGSCC_OPM-NEXT:    ret i32 [[RET2]]
+;
+; IS__CGSCC_NPM-LABEL: define {{[^@]+}}@simplify_callsite_argument
+; IS__CGSCC_NPM-SAME: (i1 [[D:%.*]])
+; IS__CGSCC_NPM-NEXT:    [[C:%.*]] = select i1 [[D]], i1 true, i1 false
+; IS__CGSCC_NPM-NEXT:    br i1 [[C]], label [[T:%.*]], label [[F:%.*]]
+; IS__CGSCC_NPM:       t:
+; IS__CGSCC_NPM-NEXT:    [[RET1:%.*]] = call i32 @func(i1 true)
+; IS__CGSCC_NPM-NEXT:    ret i32 [[RET1]]
+; IS__CGSCC_NPM:       f:
+; IS__CGSCC_NPM-NEXT:    [[RET2:%.*]] = call i32 @func(i1 false)
+; IS__CGSCC_NPM-NEXT:    ret i32 [[RET2]]
+;
+  %c = select i1 %d, i1 true, i1 false
+  br i1 %c, label %t, label %f
+t:
+  %ret1 = call i32 @func(i1 %c)
+  ret i32 %ret1
+f:
+  %ret2 = call i32 @func(i1 false)
+  ret i32 %ret2
+}
+
 !0 = !{i32 0, i32 10}
 !1 = !{i32 10, i32 100}
 
 ; NOT_TUNIT____: !0 = !{i32 0, i32 10}
 ; NOT_TUNIT____: !1 = !{i32 10, i32 100}
 ; NOT_TUNIT____-NOT: !2
 
 ; IS__TUNIT_OPM: !0 = !{i32 0, i32 10}