Addressign pr comments

Author: joaosaffran-zz

llvm/include/llvm/IR/IntrinsicsSPIRV.td

@@ -33,7 +33,7 @@ let TargetPrefix = "spv" in {
   def int_spv_ptrcast : Intrinsic<[llvm_any_ty], [llvm_any_ty, llvm_metadata_ty, llvm_i32_ty], [ImmArg<ArgIndex<2>>]>;
   def int_spv_switch : Intrinsic<[], [llvm_any_ty, llvm_vararg_ty]>;
   def int_spv_loop_merge : Intrinsic<[], [llvm_vararg_ty]>;
-  def int_spv_selection_merge : Intrinsic<[], [llvm_vararg_ty]>;
+  def int_spv_selection_merge : Intrinsic<[], [llvm_any_ty, llvm_i32_ty], [ImmArg<ArgIndex<1>>]>;
   def int_spv_cmpxchg : Intrinsic<[llvm_i32_ty], [llvm_any_ty, llvm_vararg_ty]>;
   def int_spv_unreachable : Intrinsic<[], []>;
   def int_spv_alloca : Intrinsic<[llvm_any_ty], []>;

llvm/lib/IR/Verifier.cpp

@@ -7339,6 +7339,7 @@ struct VerifierLegacyPass : public FunctionPass {
 
   bool runOnFunction(Function &F) override {
     if (!V->verify(F) && FatalErrors) {
+      auto x = V->verify(F);
       errs() << "in function " << F.getName() << '\n';
       report_fatal_error("Broken function found, compilation aborted!");
     }

llvm/lib/Target/DirectX/DXILTranslateMetadata.cpp

@@ -306,9 +306,12 @@ static void translateBranchMetadata(Module &M) {
       auto *HlslControlFlowMD =
           BBTerminatorInst->getMetadata("hlsl.controlflow.hint");
 
-      if (!HlslControlFlowMD || HlslControlFlowMD->getNumOperands() < 2)
+      if (!HlslControlFlowMD)
         continue;
 
+      assert(HlslControlFlowMD->getNumOperands() == 2 &&
+             "invalid operands for hlsl.controlflow.hint");
+
       MDBuilder MDHelper(M.getContext());
       auto *Op1 =
           mdconst::extract<ConstantInt>(HlslControlFlowMD->getOperand(1));

llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp

@@ -2810,28 +2810,14 @@ bool SPIRVInstructionSelector::selectIntrinsic(Register ResVReg,
   }
   case Intrinsic::spv_selection_merge: {
 
-    auto SelectionControl = SPIRV::SelectionControl::None;
-    auto LastOp = I.getOperand(I.getNumExplicitOperands() - 1);
-
-    assert((LastOp.isMBB() || LastOp.isMetadata()) &&
-           "Invalid type for last Machine Operand");
-
-    if (LastOp.isMetadata()) {
-      const MDNode *MDOp = LastOp.getMetadata();
-      if (MDOp->getNumOperands() == 2) {
-        if (ConstantInt *BranchHint =
-                mdconst::extract<ConstantInt>(MDOp->getOperand(1))) {
-          if (BranchHint->equalsInt(2))
-            SelectionControl = SPIRV::SelectionControl::Flatten;
-          else if (BranchHint->equalsInt(1))
-            SelectionControl = SPIRV::SelectionControl::DontFlatten;
-          else
-            llvm_unreachable("Invalid value for SelectionControl");
-        } else {
-          llvm_unreachable("Invalid value for SelectionControl");
-        }
-      }
-    }
+    int64_t SelectionControl = SPIRV::SelectionControl::None;
+    auto LastOp = I.getOperand(I.getNumOperands() - 1);
+
+    auto BranchHint = LastOp.getImm();
+    if (BranchHint == 2)
+      SelectionControl = SPIRV::SelectionControl::Flatten;
+    else if (BranchHint == 1)
+      SelectionControl = SPIRV::SelectionControl::DontFlatten;
 
     auto MIB =
         BuildMI(BB, I, I.getDebugLoc(), TII.get(SPIRV::OpSelectionMerge));

llvm/lib/Target/SPIRV/SPIRVStructurizer.cpp

@@ -1207,15 +1207,21 @@ class SPIRVStructurizer : public FunctionPass {
     Instruction *BBTerminatorInst = Builder->GetInsertBlock()->getTerminator();
 
     MDNode *MDNode = BBTerminatorInst->getMetadata("hlsl.controlflow.hint");
-    if (MDNode)
+
+    ConstantInt *BranchHint = llvm::ConstantInt::get(Builder->getInt32Ty(), 0);
+
+    if (MDNode) {
       assert(MDNode->getNumOperands() == 2 &&
              "invalid metadata hlsl.controlflow.hint");
+      BranchHint = mdconst::extract<ConstantInt>(MDNode->getOperand(1));
 
-    Value *MDNodeValue = MetadataAsValue::get(Builder->getContext(), MDNode);
+      assert(BranchHint && "invalid metadata value for hlsl.controlflow.hint");
+    }
 
-    llvm::SmallVector<llvm::Value *, 2> Args = {MergeAddress, MDNodeValue};
+    llvm::SmallVector<llvm::Value *, 2> Args = {MergeAddress, BranchHint};
 
-    Builder->CreateIntrinsic(Intrinsic::spv_selection_merge, {}, {Args});
+    Builder->CreateIntrinsic(Intrinsic::spv_selection_merge,
+                             {MergeAddress->getType()}, {Args});
   }
 };
 } // namespace llvm