[mlir][spirv] Fix integer dot product format attr validation

[kuhar]

Summary

Do not allow formats for non-scalar vector operands.

mlir/lib/Dialect/SPIRV/IR/SPIRVOps.cpp

static LogicalResult verifyIntegerDotProduct(Operation *op) {
   assert(llvm::is_contained({2u, 3u}, op->getNumOperands()) &&
          "Not an integer dot product op?");
   assert(op->getNumResults() == 1 && "Expected a single result");
 
   Type factorTy = op->getOperand(0).getType();
   if (op->getOperand(1).getType() != factorTy)
     return op->emitOpError("requires the same type for both vector operands");
 
+  unsigned expectedNumAttrs = 0;
   if (auto intTy = factorTy.dyn_cast<IntegerType>()) {
+    ++expectedNumAttrs;
     auto packedVectorFormat =
         op->getAttr(kPackedVectorFormatAttrName)
             .dyn_cast_or_null<spirv::PackedVectorFormatAttr>();
     if (!packedVectorFormat)
       return op->emitOpError("requires Packed Vector Format attribute for "
                              "integer vector operands");
 
     assert(packedVectorFormat.getValue() ==
                spirv::PackedVectorFormat::PackedVectorFormat4x8Bit &&
-           "unknown Packed Vector format");
+           "Unknown Packed Vector Format");
     if (intTy.getWidth() != 32)
       return op->emitOpError(
           llvm::formatv("with specified Packed Vector Format ({0}) requires "
                         "integer vector operands to be 32-bits wide",
                         packedVectorFormat.getValue()));
+  } else {
+    if (op->hasAttr(kPackedVectorFormatAttrName))
+      return op->emitOpError(llvm::formatv(
+          "with invalid format attribute for vector operands of type '{0}'",
+          factorTy));
   }
 
-  if (op->getAttrs().size() > 1)
+  if (op->getAttrs().size() > expectedNumAttrs)
     return op->emitError(
         "op only supports the 'format' #spirv.packed_vector_format attribute");
 
   Type resultTy = op->getResultTypes().front();
   bool hasAccumulator = op->getNumOperands() == 3;
   if (hasAccumulator && op->getOperand(2).getType() != resultTy)
     return op->emitOpError(
         "requires the same accumulator operand and result types");

mlir/test/Dialect/SPIRV/IR/integer-dot-product-ops.mlir

 
 // -----
 
 func.func @sdot_scalar_bad_types(%a: i32, %b: i64) -> i32 {
   // expected-error @+1 {{op requires the same type for both vector operands}}
   %r = spirv.SDot %a, %b : (i32, i64) -> i32
   return %r : i32
 }
+// -----
+
+func.func @sdot_vector_4xi8_bad_attr(%a: vector<4xi8>, %b: vector<4xi8>) -> i32 {
+  // expected-error @+1 {{op with invalid format attribute for vector operands of type 'vector<4xi8>'}}
+  %r = spirv.SDot %a, %b {format = #spirv.packed_vector_format<PackedVectorFormat4x8Bit>}:
+        (vector<4xi8>, vector<4xi8>) -> i32
+  return %r : i32
+}
 
 // -----
 
 func.func @sdot_scalar_i32_bad_attr(%a: i32, %b: i32) -> i32 {
   // expected-error @+1 {{op only supports the 'format' #spirv.packed_vector_format attribute}}
   %r = spirv.SDot %a, %b {volatile = #spirv.decoration<Volatile>,
                           format = #spirv.packed_vector_format<PackedVectorFormat4x8Bit>}: (i32, i32) -> i32
   return %r : i32
 }
 
 // -----
 
+func.func @udot_vector_4xi8_bad_attr(%a: vector<4xi8>, %b: vector<4xi8>) -> i32 {
+  // expected-error @+1 {{op only supports the 'format' #spirv.packed_vector_format attribute}}
+  %r = spirv.UDot %a, %b {volatile = #spirv.decoration<Volatile>}: (vector<4xi8>, vector<4xi8>) -> i32
+  return %r : i32
+}
+
+// -----
+
 func.func @sdot_scalar_bad_types(%a: i32, %b: i32) -> i16 {
   // expected-error @+1 {{op result type has insufficient bit-width (16 bits) for the specified vector operand type (32 bits)}}
   %r = spirv.SDot %a, %b {format = #spirv.packed_vector_format<PackedVectorFormat4x8Bit>}: (i32, i32) -> i16
   return %r : i16
 }
 
 // -----