[PATCH] D107356: [Lowering] Support lowering of llvm.experimental.ptr.provenance.

[Jeroen Dobbelaere via Phabricator via llvm-commits]

jeroen.dobbelaere updated this revision to Diff 440970.
jeroen.dobbelaere edited the summary of this revision.
jeroen.dobbelaere added a comment.

Rebased to ffe262a198a9f9030991df6d3ddd812e74fa3523 <https://reviews.llvm.org/rGffe262a198a9f9030991df6d3ddd812e74fa3523>

Added support for passing `ptr_provenance` argument of load/store instructions to `MachineMemOperand` when lowering.


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D107356/new/

https://reviews.llvm.org/D107356

Files:
  llvm/lib/CodeGen/IntrinsicLowering.cpp
  llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
  llvm/test/CodeGen/Generic/ptr_provenance.ll


Index: llvm/test/CodeGen/Generic/ptr_provenance.ll
===================================================================
--- /dev/null
+++ llvm/test/CodeGen/Generic/ptr_provenance.ll
@@ -0,0 +1,8 @@
+; RUN: llc < %s
+
+define i32* @test(i32* %p, i32* %p.provenance) {
+  %p.joined = call i32* @llvm.experimental.ptr.provenance.p0i32.p0i32(i32* %p, i32* %p.provenance)
+  ret i32* %p.joined
+}
+
+declare i32* @llvm.experimental.ptr.provenance.p0i32.p0i32(i32*, i32*) nounwind readnone
Index: llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
===================================================================
--- llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
+++ llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
@@ -4123,6 +4123,7 @@
   MachineMemOperand::Flags MMOFlags
     = TLI.getLoadMemOperandFlags(I, DAG.getDataLayout());
 
+  const auto *PtrProvenance = I.getOptionalPtrProvenance().getValueOr(nullptr);
   unsigned ChainI = 0;
   for (unsigned i = 0; i != NumValues; ++i, ++ChainI) {
     // Serializing loads here may result in excessive register pressure, and
@@ -4143,9 +4144,10 @@
                             DAG.getConstant(Offsets[i], dl, PtrVT),
                             Flags);
 
-    SDValue L = DAG.getLoad(MemVTs[i], dl, Root, A,
-                            MachinePointerInfo(SV, Offsets[i]), Alignment,
-                            MMOFlags, AAInfo, Ranges);
+    SDValue L =
+        DAG.getLoad(MemVTs[i], dl, Root, A,
+                    MachinePointerInfo(SV, Offsets[i], 0, PtrProvenance),
+                    Alignment, MMOFlags, AAInfo, Ranges);
     Chains[ChainI] = L.getValue(1);
 
     if (MemVTs[i] != ValueVTs[i])
@@ -4272,6 +4274,7 @@
   SDNodeFlags Flags;
   Flags.setNoUnsignedWrap(true);
 
+  const auto *PtrProvenance = I.getOptionalPtrProvenance().getValueOr(nullptr);
   unsigned ChainI = 0;
   for (unsigned i = 0; i != NumValues; ++i, ++ChainI) {
     // See visitLoad comments.
@@ -4287,7 +4290,8 @@
     if (MemVTs[i] != ValueVTs[i])
       Val = DAG.getPtrExtOrTrunc(Val, dl, MemVTs[i]);
     SDValue St =
-        DAG.getStore(Root, dl, Val, Add, MachinePointerInfo(PtrV, Offsets[i]),
+        DAG.getStore(Root, dl, Val, Add,
+                     MachinePointerInfo(PtrV, Offsets[i], 0, PtrProvenance),
                      Alignment, MMOFlags, AAInfo);
     Chains[ChainI] = St;
   }
@@ -6690,6 +6694,7 @@
   case Intrinsic::ptr_annotation:
   case Intrinsic::launder_invariant_group:
   case Intrinsic::strip_invariant_group:
+  case Intrinsic::experimental_ptr_provenance:
     // Drop the intrinsic, but forward the value
     setValue(&I, getValue(I.getOperand(0)));
     return;
Index: llvm/lib/CodeGen/IntrinsicLowering.cpp
===================================================================
--- llvm/lib/CodeGen/IntrinsicLowering.cpp
+++ llvm/lib/CodeGen/IntrinsicLowering.cpp
@@ -333,6 +333,11 @@
   case Intrinsic::var_annotation:
     break;   // Strip out these intrinsics
 
+  case Intrinsic::experimental_ptr_provenance:
+    // Drop the provenance, but forward the value
+    CI->replaceAllUsesWith(CI->getOperand(0));
+    break;
+
   case Intrinsic::memcpy: {
     Type *IntPtr = DL.getIntPtrType(Context);
     Value *Size = Builder.CreateIntCast(CI->getArgOperand(2), IntPtr,


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D107356.440970.patch
Type: text/x-patch
Size: 3271 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220629/8a431928/attachment.bin>