spirv-val: Add OpSizeOf

Author: spencer-lunarg

source/val/validate_misc.cpp

@@ -82,6 +82,15 @@ spv_result_t ValidateShaderClock(ValidationState_t& _,
   return SPV_SUCCESS;
 }
 
+spv_result_t ValidateSizeOf(ValidationState_t& _, const Instruction* inst) {
+  const uint32_t result_type = inst->type_id();
+  if (!_.IsIntScalarType(result_type, 32)) {
+    return _.diag(SPV_ERROR_INVALID_DATA, inst)
+           << "Expected OpSizeOf Result Type to be a 32-bit int scalar.";
+  }
+  return SPV_SUCCESS;
+}
+
 spv_result_t ValidateAssumeTrue(ValidationState_t& _, const Instruction* inst) {
   const auto operand_type_id = _.GetOperandTypeId(inst, 0);
   if (!operand_type_id || !_.IsBoolScalarType(operand_type_id)) {
@@ -193,6 +202,11 @@ spv_result_t MiscPass(ValidationState_t& _, const Instruction* inst) {
         return error;
       }
       break;
+    case spv::Op::OpSizeOf:
+      if (auto error = ValidateSizeOf(_, inst)) {
+        return error;
+      }
+      break;
     case spv::Op::OpAssumeTrueKHR:
       if (auto error = ValidateAssumeTrue(_, inst)) {
         return error;

test/val/val_misc_test.cpp

@@ -105,6 +105,57 @@ TEST_F(ValidateMisc, SizeOfValid) {
   EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_UNIVERSAL_1_1));
 }
 
+TEST_F(ValidateMisc, SizeOfFloat) {
+  const std::string spirv = R"(
+               OpCapability Addresses
+               OpCapability Kernel
+               OpMemoryModel Physical64 OpenCL
+               OpEntryPoint Kernel %f "f"
+       %void = OpTypeVoid
+        %f32 = OpTypeFloat 32
+        %ptr = OpTypePointer CrossWorkgroup %f32
+       %fnTy = OpTypeFunction %void
+          %f = OpFunction %void None %fnTy
+      %entry = OpLabel
+          %s = OpSizeOf %f32 %ptr
+               OpReturn
+               OpFunctionEnd
+)";
+
+  CompileSuccessfully(spirv, SPV_ENV_UNIVERSAL_1_1);
+  EXPECT_EQ(SPV_ERROR_INVALID_DATA,
+            ValidateInstructions(SPV_ENV_UNIVERSAL_1_1));
+  EXPECT_THAT(
+      getDiagnosticString(),
+      HasSubstr("Expected OpSizeOf Result Type to be a 32-bit int scalar"));
+}
+
+TEST_F(ValidateMisc, SizeOfVector) {
+  const std::string spirv = R"(
+               OpCapability Addresses
+               OpCapability Kernel
+               OpMemoryModel Physical64 OpenCL
+               OpEntryPoint Kernel %f "f"
+       %void = OpTypeVoid
+        %i32 = OpTypeInt 32 0
+      %v2i32 = OpTypeVector %i32 2
+        %ptr = OpTypePointer CrossWorkgroup %v2i32
+       %fnTy = OpTypeFunction %void
+          %f = OpFunction %void None %fnTy
+      %entry = OpLabel
+          %s = OpSizeOf %v2i32 %ptr
+               OpReturn
+               OpFunctionEnd
+)";
+
+  CompileSuccessfully(spirv, SPV_ENV_UNIVERSAL_1_1);
+  EXPECT_EQ(SPV_ERROR_INVALID_DATA,
+            ValidateInstructions(SPV_ENV_UNIVERSAL_1_1));
+  EXPECT_THAT(
+      getDiagnosticString(),
+      HasSubstr("Expected OpSizeOf Result Type to be a 32-bit int scalar"));
+}
+
 const std::string ShaderClockSpirv = R"(
 OpCapability Shader
 OpCapability Int64