spirv-val: Some Float16 fixes

source/val/validate_capability.cpp

@@ -221,6 +221,7 @@ bool IsSupportOptionalOpenCL_1_2(uint32_t capability) {
   switch (spv::Capability(capability)) {
     case spv::Capability::ImageBasic:
     case spv::Capability::Float64:
+    case spv::Capability::Float16:
       return true;
     default:
       break;

source/val/validate_small_type_uses.cpp

@@ -22,7 +22,7 @@ namespace val {
 
 spv_result_t ValidateSmallTypeUses(ValidationState_t& _,
                                    const Instruction* inst) {
-  if (!_.HasCapability(spv::Capability::Shader) || inst->type_id() == 0 ||
+  if (inst->type_id() == 0 ||
       !_.ContainsLimitedUseIntOrFloatType(inst->type_id())) {
     return SPV_SUCCESS;
   }

test/val/val_data_test.cpp

@@ -89,6 +89,13 @@ std::string header_with_float64 = R"(
      OpCapability Float64
      OpMemoryModel Logical GLSL450
 )";
+std::string header_with_kernel_float16 = R"(
+    OpCapability Addresses
+    OpCapability Kernel
+    OpCapability Linkage
+    OpCapability Float16
+    OpMemoryModel Physical32 OpenCL
+)";
 
 std::string invalid_comp_error = "Illegal number of components";
 std::string missing_cap_error = "requires the Vector16 capability";
@@ -340,6 +347,12 @@ TEST_F(ValidateData, float16_buffer_good) {
   ASSERT_EQ(SPV_SUCCESS, ValidateInstructions());
 }
 
+TEST_F(ValidateData, float16_kernel_good) {
+  std::string str = header_with_kernel_float16 + "%2 = OpTypeFloat 16";
+  CompileSuccessfully(str.c_str());
+  ASSERT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_OPENCL_1_2));
+}
+
 TEST_F(ValidateData, float16_bad) {
   std::string str = header + "%2 = OpTypeFloat 16";
   CompileSuccessfully(str.c_str());

test/val/val_small_type_uses_test.cpp

@@ -333,6 +333,85 @@ INSTANTIATE_TEST_SUITE_P(
            "%inst = OpFunctionCall %void %half_func %ld_half",
            "%inst = OpFunctionCall %void %half_func %float_to_half"));
 
+TEST_F(ValidateSmallTypeUses, F16OpsFail) {
+  const std::string body = R"(
+        OpCapability Addresses
+        OpCapability Kernel
+        OpCapability Float16Buffer
+        OpCapability Linkage
+        OpMemoryModel Physical64 OpenCL
+ %f16 = OpTypeFloat 16
+%func = OpTypeFunction %f16 %f16 %f16
+ %add = OpFunction %f16 None %func
+   %a = OpFunctionParameter %f16
+   %b = OpFunctionParameter %f16
+ %lbl = OpLabel
+ %res = OpFAdd %f16 %a %b
+        OpReturnValue %res
+        OpFunctionEnd
+)";
+
+  CompileSuccessfully(body.c_str());
+  ASSERT_EQ(SPV_ERROR_INVALID_ID, ValidateInstructions());
+  EXPECT_THAT(getDiagnosticString(),
+              HasSubstr("Invalid use of 8- or 16-bit result"));
+}
+
+TEST_F(ValidateSmallTypeUses, F16OpsSuccess) {
+  const std::string body = R"(
+        OpCapability Addresses
+        OpCapability Kernel
+        OpCapability Float16Buffer
+        OpCapability Float16
+        OpCapability Linkage
+        OpMemoryModel Physical64 OpenCL
+ %f16 = OpTypeFloat 16
+%func = OpTypeFunction %f16 %f16 %f16
+ %add = OpFunction %f16 None %func
+   %a = OpFunctionParameter %f16
+   %b = OpFunctionParameter %f16
+ %lbl = OpLabel
+ %res = OpFAdd %f16 %a %b
+        OpReturnValue %res
+        OpFunctionEnd
+)";
+
+  CompileSuccessfully(body.c_str());
+  ASSERT_EQ(SPV_SUCCESS, ValidateInstructions());
+}
+
+TEST_F(ValidateSmallTypeUses, OpenCLVloadVstoreGood) {
+  // Using vload_half and vstore_half should be allowed
+  // with only Float16Buffer declared.
+  const std::string body = R"(
+        OpCapability Addresses
+        OpCapability Kernel
+        OpCapability Float16Buffer
+        OpCapability Linkage
+        OpCapability Int64
+ %ocl = OpExtInstImport "OpenCL.std"
+        OpMemoryModel Physical64 OpenCL
+%void = OpTypeVoid
+ %u64 = OpTypeInt 64 0
+ %f16 = OpTypeFloat 16
+ %f32 = OpTypeFloat 32
+%pf16 = OpTypePointer CrossWorkgroup %f16
+%func = OpTypeFunction %void %pf16 %pf16
+ %idx = OpConstant %u64 1
+ %add = OpFunction %void None %func
+ %src = OpFunctionParameter %pf16
+ %dst = OpFunctionParameter %pf16
+ %lbl = OpLabel
+   %a = OpExtInst %f32 %ocl vload_half %idx %src
+   %_ = OpExtInst %void %ocl vstore_half %a %idx %dst
+        OpReturn
+        OpFunctionEnd
+)";
+
+  CompileSuccessfully(body.c_str());
+  ASSERT_EQ(SPV_SUCCESS, ValidateInstructions());
+}
+
 }  // namespace
 }  // namespace val
 }  // namespace spvtools