implement feedback

Author: ro-i

llvm/include/llvm/CodeGen/GlobalISel/IRTranslator.h

@@ -297,9 +297,9 @@ class IRTranslator : public MachineFunctionPass {
   /// \pre \p U is a call instruction.
   bool translateCall(const User &U, MachineIRBuilder &MIRBuilder);
 
-  bool translateTargetIntrinsic(
+  bool translateIntrinsic(
       const CallBase &CB, Intrinsic::ID ID, MachineIRBuilder &MIRBuilder,
-      TargetLowering::IntrinsicInfo *TgtMemIntrinsicInfo = nullptr);
+      const TargetLowering::IntrinsicInfo *TgtMemIntrinsicInfo = nullptr);
 
   /// When an invoke or a cleanupret unwinds to the next EH pad, there are
   /// many places it could ultimately go. In the IR, we have a single unwind

llvm/lib/CodeGen/GlobalISel/IRTranslator.cpp

@@ -2803,17 +2803,17 @@ bool IRTranslator::translateCall(const User &U, MachineIRBuilder &MIRBuilder) {
   TargetLowering::IntrinsicInfo Info;
   bool IsTgtMemIntrinsic = TLI->getTgtMemIntrinsic(Info, CI, *MF, ID);
 
-  return translateTargetIntrinsic(CI, ID, MIRBuilder,
-                                  IsTgtMemIntrinsic ? &Info : nullptr);
+  return translateIntrinsic(CI, ID, MIRBuilder,
+                            IsTgtMemIntrinsic ? &Info : nullptr);
 }
 
-/// Translate a call to a target intrinsic.
+/// Translate a call to an intrinsic.
 /// Depending on whether TLI->getTgtMemIntrinsic() is true, TgtMemIntrinsicInfo
 /// is a pointer to the correspondingly populated IntrinsicInfo object.
 /// Otherwise, this pointer is null.
-bool IRTranslator::translateTargetIntrinsic(
+bool IRTranslator::translateIntrinsic(
     const CallBase &CB, Intrinsic::ID ID, MachineIRBuilder &MIRBuilder,
-    TargetLowering::IntrinsicInfo *TgtMemIntrinsicInfo) {
+    const TargetLowering::IntrinsicInfo *TgtMemIntrinsicInfo) {
   ArrayRef<Register> ResultRegs;
   if (!CB.getType()->isVoidTy())
     ResultRegs = getOrCreateVRegs(CB);
@@ -2869,11 +2869,12 @@ bool IRTranslator::translateTargetIntrinsic(
     // TODO: We currently just fallback to address space 0 if getTgtMemIntrinsic
     //       didn't yield anything useful.
     MachinePointerInfo MPI;
-    if (TgtMemIntrinsicInfo->ptrVal)
+    if (TgtMemIntrinsicInfo->ptrVal) {
       MPI = MachinePointerInfo(TgtMemIntrinsicInfo->ptrVal,
                                TgtMemIntrinsicInfo->offset);
-    else if (TgtMemIntrinsicInfo->fallbackAddressSpace)
+    } else if (TgtMemIntrinsicInfo->fallbackAddressSpace) {
       MPI = MachinePointerInfo(*TgtMemIntrinsicInfo->fallbackAddressSpace);
+    }
     MIB.addMemOperand(MF->getMachineMemOperand(
         MPI, TgtMemIntrinsicInfo->flags, MemTy, Alignment, CB.getAAMetadata(),
         /*Ranges=*/nullptr, TgtMemIntrinsicInfo->ssid,

llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp

@@ -5368,8 +5368,9 @@ SmallVector<SDValue, 8> SelectionDAGBuilder::getTargetIntrinsicOperands(
     }
   }
 
-  if (auto Bundle = I.getOperandBundle(LLVMContext::OB_convergencectrl)) {
-    auto *Token = Bundle->Inputs[0].get();
+  if (std::optional<OperandBundleUse> Bundle =
+          I.getOperandBundle(LLVMContext::OB_convergencectrl)) {
+    Value *Token = Bundle->Inputs[0].get();
     SDValue ConvControlToken = getValue(Token);
     assert(Ops.back().getValueType() != MVT::Glue &&
            "Did not expected another glue node here.");
@@ -5396,9 +5397,10 @@ SDVTList SelectionDAGBuilder::getTargetIntrinsicVTList(const CallBase &I,
 
 /// Get an INTRINSIC node for a target intrinsic which does not touch touch
 /// memory.
-SDValue SelectionDAGBuilder::getTargetNonMemIntrinsicNode(
-    const CallBase &I, bool HasChain, SmallVector<SDValue, 8> &Ops,
-    SDVTList &VTs) {
+SDValue SelectionDAGBuilder::getTargetNonMemIntrinsicNode(const CallBase &I,
+                                                          bool HasChain,
+                                                          ArrayRef<SDValue> Ops,
+                                                          SDVTList &VTs) {
   if (!HasChain)
     return DAG.getNode(ISD::INTRINSIC_WO_CHAIN, getCurSDLoc(), VTs, Ops);
   if (!I.getType()->isVoidTy())

llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.h

@@ -718,8 +718,7 @@ class SelectionDAGBuilder {
       TargetLowering::IntrinsicInfo *TgtMemIntrinsicInfo = nullptr);
   SDVTList getTargetIntrinsicVTList(const CallBase &I, bool HasChain);
   SDValue getTargetNonMemIntrinsicNode(const CallBase &I, bool HasChain,
-                                       SmallVector<SDValue, 8> &Ops,
-                                       SDVTList &VTs);
+                                       ArrayRef<SDValue> Ops, SDVTList &VTs);
   SDValue handleTargetIntrinsicRet(const CallBase &I, bool HasChain,
                                    bool OnlyLoad, SDValue Result);
 };