fixing tests

Author: joaosaffran-zz

llvm/lib/Target/DirectX/DXILTranslateMetadata.cpp

@@ -298,7 +298,7 @@ static MDTuple *emitTopLevelLibraryNode(Module &M, MDNode *RMD,
 
 // TODO: We might need to refactor this to be more generic,
 // in case we need more metadata to be replaced.
-static void replaceMetadata(Module &M) {
+static void translateBranchMetadata(Module &M) {
   for (auto &F : M) {
     for (auto &BB : F) {
       auto *BBTerminatorInst = BB.getTerminator();
@@ -395,7 +395,7 @@ PreservedAnalyses DXILTranslateMetadata::run(Module &M,
   const dxil::ModuleMetadataInfo MMDI = MAM.getResult<DXILMetadataAnalysis>(M);
 
   translateMetadata(M, DRM, MDResources, ShaderFlags, MMDI);
-  replaceMetadata(M);
+  translateBranchMetadata(M);
 
   return PreservedAnalyses::all();
 }
@@ -429,7 +429,7 @@ class DXILTranslateMetadataLegacy : public ModulePass {
         getAnalysis<DXILMetadataAnalysisWrapperPass>().getModuleMetadata();
 
     translateMetadata(M, DRM, MDResources, ShaderFlags, MMDI);
-    replaceMetadata(M);
+    translateBranchMetadata(M);
     return true;
   }
 };

llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp

@@ -2811,18 +2811,26 @@ bool SPIRVInstructionSelector::selectIntrinsic(Register ResVReg,
   case Intrinsic::spv_selection_merge: {
 
     auto SelectionControl = SPIRV::SelectionControl::None;
-    const MDNode *MDOp =
-        I.getOperand(I.getNumExplicitOperands() - 1).getMetadata();
-    if (MDOp->getNumOperands() > 0) {
-      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");
+    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");
+        }
+      }
     }
 
     auto MIB =

llvm/lib/Target/SPIRV/SPIRVStructurizer.cpp

@@ -1207,8 +1207,9 @@ class SPIRVStructurizer : public FunctionPass {
     Instruction *BBTerminatorInst = Builder->GetInsertBlock()->getTerminator();
 
     MDNode *MDNode = BBTerminatorInst->getMetadata("hlsl.controlflow.hint");
-    if (MDNode && MDNode->getNumOperands() != 2)
-      llvm_unreachable("invalid metadata hlsl.controlflow.hint");
+    if (MDNode)
+      assert(MDNode->getNumOperands() == 2 &&
+             "invalid metadata hlsl.controlflow.hint");
 
     Value *MDNodeValue = MetadataAsValue::get(Builder->getContext(), MDNode);