only add required capabilities

Author: inbelic

llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp

@@ -1385,13 +1385,28 @@ void addInstrRequirements(const MachineInstr &MI,
     break;
   case SPIRV::OpSDot:
   case SPIRV::OpUDot: {
-    if (ST.canUseExtension(SPIRV::Extension::SPV_KHR_integer_dot_product)) {
+    if (ST.canUseExtension(SPIRV::Extension::SPV_KHR_integer_dot_product))
       Reqs.addExtension(SPIRV::Extension::SPV_KHR_integer_dot_product);
-    }
     Reqs.addCapability(SPIRV::Capability::DotProductKHR);
-    Reqs.addCapability(SPIRV::Capability::DotProductInputAllKHR);
-    Reqs.addCapability(SPIRV::Capability::DotProductInput4x8BitKHR);
-    Reqs.addCapability(SPIRV::Capability::DotProductInput4x8BitPackedKHR);
+
+    const MachineRegisterInfo &MRI = MI.getMF()->getRegInfo();
+    const MachineInstr *InstrPtr = &MI;
+    assert(MI.getOperand(1).isReg() && "Unexpected operand in dot");
+
+    Register TypeReg = InstrPtr->getOperand(1).getReg();
+    SPIRVType *TypeDef = MRI.getVRegDef(TypeReg);
+    if (TypeDef->getOpcode() == SPIRV::OpTypeInt) {
+      assert(TypeDef->getOperand(1).getImm() == 32);
+      Reqs.addCapability(SPIRV::Capability::DotProductInput4x8BitPackedKHR);
+    } else if (TypeDef->getOpcode() == SPIRV::OpTypeVector) {
+      SPIRVType *ScalarTypeDef =
+          MRI.getVRegDef(TypeDef->getOperand(1).getReg());
+      assert(ScalarTypeDef->getOpcode() == SPIRV::OpTypeInt);
+      auto Capability = ScalarTypeDef->getOperand(1).getImm() == 8
+                            ? SPIRV::Capability::DotProductInput4x8BitKHR
+                            : SPIRV::Capability::DotProductInputAllKHR;
+      Reqs.addCapability(Capability);
+    }
     break;
   }
   default:

llvm/test/CodeGen/SPIRV/hlsl-intrinsics/dot4add_i8packed.ll

@@ -1,10 +1,11 @@
-; RUN: llc -O0 -mtriple=spirv32-unknown-unknown %s -o - | FileCheck %s --check-prefixes=CHECK,CHECK-EXP
-; RUN: llc -O0 -mtriple=spirv32v1.6-unknown-unknown %s -o - | FileCheck %s --check-prefixes=CHECK,CHECK-DOT
-; RUN: llc -O0 -mtriple=spirv32-unknown-unknown -spirv-ext=+SPV_KHR_integer_dot_product %s -o - | FileCheck %s --check-prefixes=CHECK,CHECK-DOT,CHECK-EXT
-; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv32-unknown-unknown %s -o - -filetype=obj | spirv-val %}
-; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv32v1.6-unknown-unknown %s -o - -filetype=obj | spirv-val %}
-; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv32-unknown-unknown -spirv-ext=+SPV_KHR_integer_dot_product %s -o - -filetype=obj | spirv-val %}
+; RUN: llc -O0 -mtriple=spirv-unknown-unknown %s -o - | FileCheck %s --check-prefixes=CHECK,CHECK-EXP
+; RUN: llc -O0 -mtriple=spirv1.6-unknown-unknown %s -o - | FileCheck %s --check-prefixes=CHECK,CHECK-DOT
+; RUN: llc -O0 -mtriple=spirv-unknown-unknown -spirv-ext=+SPV_KHR_integer_dot_product %s -o - | FileCheck %s --check-prefixes=CHECK,CHECK-DOT,CHECK-EXT
+; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv-unknown-unknown %s -o - -filetype=obj | spirv-val %}
+; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv1.6-unknown-unknown %s -o - -filetype=obj | spirv-val %}
+; RUN: %if spirv-tools %{ llc -O0 -mtriple=spirv-unknown-unknown -spirv-ext=+SPV_KHR_integer_dot_product %s -o - -filetype=obj | spirv-val %}
 
+; CHECK-DOT: OpCapability DotProductKHR
 ; CHECK-DOT: OpCapability DotProductInput4x8BitPackedKHR
 ; CHECK-EXT: OpExtension "SPV_KHR_integer_dot_product"