SPV_QCOM_image_processing3

Author: wooyoungqcom

DEPS

@@ -14,7 +14,7 @@ vars = {
 
   're2_revision': '972a15cedd008d846f1a39b2e88ce48d7f166cbd',
 
-  'spirv_headers_revision': '1a22b167081842915a1c78a0b5b5a353a23284aa',
+  'spirv_headers_revision': 'ecb0849421c798f37d8ff82b28bb728a55eee2b5',
 
   'mimalloc_revision': 'b1963961a5cdb1996c9ad2e356014089b7a94ea3',
 }

include/spirv-tools/libspirv.h

@@ -337,6 +337,9 @@ typedef enum spv_operand_type_t {
   SPV_OPERAND_TYPE_OPTIONAL_CAPABILITY,
   SPV_OPERAND_TYPE_VARIABLE_CAPABILITY,
 
+  // Enum type from SPV_QCOM_image_processing3
+  SPV_OPERAND_TYPE_GATHER_MODES,
+
   // This is a sentinel value, and does not represent an operand type.
   // It should come last.
   SPV_OPERAND_TYPE_NUM_OPERAND_TYPES,

source/operand.cpp

@@ -207,6 +207,8 @@ const char* spvOperandTypeStr(spv_operand_type_t type) {
       return "cooperative vector matrix layout";
     case SPV_OPERAND_TYPE_COMPONENT_TYPE:
       return "component type";
+    case SPV_OPERAND_TYPE_GATHER_MODES:
+      return "gather modes";
 
     case SPV_OPERAND_TYPE_KERNEL_PROPERTY_FLAGS:
       return "kernel property flags";
@@ -339,6 +341,7 @@ bool spvOperandIsConcrete(spv_operand_type_t type) {
     case SPV_OPERAND_TYPE_TENSOR_CLAMP_MODE:
     case SPV_OPERAND_TYPE_COOPERATIVE_VECTOR_MATRIX_LAYOUT:
     case SPV_OPERAND_TYPE_COMPONENT_TYPE:
+    case SPV_OPERAND_TYPE_GATHER_MODES:
     case SPV_OPERAND_TYPE_KERNEL_PROPERTY_FLAGS:
     case SPV_OPERAND_TYPE_SHDEBUG100_BUILD_IDENTIFIER_FLAGS:
     case SPV_OPERAND_TYPE_SHDEBUG100_DEBUG_BASE_TYPE_ATTRIBUTE_ENCODING:

source/val/validate_image.cpp

@@ -637,7 +637,8 @@ spv_result_t ValidateImageOperands(ValidationState_t& _,
       if (opcode != spv::Op::OpImageGather &&
           opcode != spv::Op::OpImageDrefGather &&
           opcode != spv::Op::OpImageSparseGather &&
-          opcode != spv::Op::OpImageSparseDrefGather) {
+          opcode != spv::Op::OpImageSparseDrefGather &&
+          opcode != spv::Op::OpImageGatherQCOM) {
         return _.diag(SPV_ERROR_INVALID_DATA, inst)
                << _.VkErrorID(10213)
                << "Image Operand Offset can only be used with "
@@ -652,7 +653,8 @@ spv_result_t ValidateImageOperands(ValidationState_t& _,
     if (opcode != spv::Op::OpImageGather &&
         opcode != spv::Op::OpImageDrefGather &&
         opcode != spv::Op::OpImageSparseGather &&
-        opcode != spv::Op::OpImageSparseDrefGather) {
+        opcode != spv::Op::OpImageSparseDrefGather &&
+        opcode != spv::Op::OpImageGatherQCOM) {
       return _.diag(SPV_ERROR_INVALID_DATA, inst)
              << "Image Operand ConstOffsets can only be used with "
                 "OpImageGather and OpImageDrefGather";
@@ -1199,6 +1201,7 @@ bool IsAllowedSampledImageOperand(spv::Op opcode, ValidationState_t& _) {
     case spv::Op::OpImageBlockMatchWindowSSDQCOM:
     case spv::Op::OpImageBlockMatchGatherSADQCOM:
     case spv::Op::OpImageBlockMatchGatherSSDQCOM:
+    case spv::Op::OpImageGatherQCOM:
     case spv::Op::OpImageSampleFootprintNV:
       return true;
     case spv::Op::OpStore:
@@ -1225,6 +1228,7 @@ spv_result_t ValidateImageCoordinate(ValidationState_t& _,
       opcode == spv::Op::OpImageSampleProjDrefImplicitLod ||
       opcode == spv::Op::OpImageSampleProjDrefExplicitLod ||
       opcode == spv::Op::OpImageGather ||
+      opcode == spv::Op::OpImageGatherQCOM ||
       opcode == spv::Op::OpImageDrefGather ||
       opcode == spv::Op::OpImageQueryLod ||
       opcode == spv::Op::OpImageSparseSampleImplicitLod ||
@@ -1853,8 +1857,10 @@ spv_result_t ValidateImageGather(ValidationState_t& _,
           ValidateImageCoordinate(_, inst, info, /* word_index = */ 3))
     return result;
 
+  unsigned n_additional_operands = 0;
   if (opcode == spv::Op::OpImageGather ||
-      opcode == spv::Op::OpImageSparseGather) {
+      opcode == spv::Op::OpImageSparseGather ||
+      opcode == spv::Op::OpImageGatherQCOM) {
     const uint32_t component = inst->GetOperandAs<uint32_t>(4);
     const uint32_t component_index_type = _.GetTypeId(component);
     if (!_.IsIntScalarType(component_index_type, 32)) {
@@ -1869,14 +1875,24 @@ spv_result_t ValidateImageGather(ValidationState_t& _,
                   "environment";
       }
     }
+    if (opcode == spv::Op::OpImageGatherQCOM) {
+      const uint32_t mode = inst->GetOperandAs<uint32_t>(5);
+      const uint32_t mode_index_type = _.GetTypeId(mode);
+      if (!_.IsIntScalarType(mode_index_type) ||
+          _.GetBitWidth(mode_index_type) != 32) {
+        return _.diag(SPV_ERROR_INVALID_DATA, inst)
+               << "Expected Mode to be 32-bit int scalar";
+      }
+      n_additional_operands += 1;
+    }
   } else {
     assert(opcode == spv::Op::OpImageDrefGather ||
            opcode == spv::Op::OpImageSparseDrefGather);
     if (spv_result_t result = ValidateImageDref(_, inst, info)) return result;
   }
 
   if (spv_result_t result =
-          ValidateImageOperands(_, inst, info, /* word_index = */ 7))
+          ValidateImageOperands(_, inst, info, /* word_index = */ (7 + n_additional_operands)))
     return result;
 
   return SPV_SUCCESS;
@@ -2689,6 +2705,7 @@ spv_result_t ImagePass(ValidationState_t& _, const Instruction* inst) {
     case spv::Op::OpImageDrefGather:
     case spv::Op::OpImageSparseGather:
     case spv::Op::OpImageSparseDrefGather:
+    case spv::Op::OpImageGatherQCOM:
       return ValidateImageGather(_, inst);
 
     case spv::Op::OpImageRead:
@@ -2794,6 +2811,7 @@ bool IsImageInstruction(const spv::Op opcode) {
     case spv::Op::OpImageBlockMatchWindowSSDQCOM:
     case spv::Op::OpImageBlockMatchGatherSADQCOM:
     case spv::Op::OpImageBlockMatchGatherSSDQCOM:
+    case spv::Op::OpImageGatherQCOM:
       return true;
     default:
       break;