Add the VUID-StandaloneSpirv-OpControlBarrierArriveEXT-13553 check (KhronosGroup#6782)

Add the VUID-StandaloneSpirv-OpControlBarrierArriveEXT-13553 check
(KhronosGroup#6771)

Author: wooyoungqcom

source/val/validate_scopes.cpp

@@ -139,6 +139,15 @@ spv_result_t ValidateExecutionScope(ValidationState_t& _,
           });
     }
 
+    if (opcode == spv::Op::OpControlBarrierArriveEXT ||
+        opcode == spv::Op::OpControlBarrierWaitEXT) {
+      if (value != spv::Scope::Workgroup && value != spv::Scope::Subgroup) {
+        return _.diag(SPV_ERROR_INVALID_DATA, inst)
+               << _.VkErrorID(13553)
+               << "The execution Scope for OpControlBarrierArriveEXT and "
+                  "OpControlBarrierWaitEXT must be Workgroup or Subgroup";
+      }
+    }
     // Only subset of execution models support Workgroup.
     if (value == spv::Scope::Workgroup) {
       std::string errorVUID = _.VkErrorID(4637);

source/val/validation_state.cpp

@@ -3515,6 +3515,8 @@ std::string ValidationState_t::VkErrorID(uint32_t id,
       return VUID_WRAP(VUID-StandaloneSpirv-MemorySemantics-13551);
     case 13552:
       return VUID_WRAP(VUID-StandaloneSpirv-SplitBarrierEXT-13552);
+    case 13553:
+      return VUID_WRAP(VUID-StandaloneSpirv-OpControlBarrierArriveEXT-13553);
     case 13556:
       return VUID_WRAP(VUID-StandaloneSpirv-MemorySemantics-13556);
     case 13557:

test/val/val_barriers_test.cpp

@@ -1365,6 +1365,68 @@ OpControlBarrierWaitEXT %workgroup %workgroup %acquire_workgroup_memory
                         "any stage other than GLCompute or Kernel."));
 }
 
+TEST_F(ValidateBarriers, OpControlBarrierArriveExecutionScope) {
+  const std::string body = R"(
+OpControlBarrierArriveEXT %device %workgroup %release_workgroup_memory
+OpControlBarrierWaitEXT %workgroup %workgroup %acquire_workgroup_memory
+)";
+
+  CompileSuccessfully(GenerateShaderCodeImpl(body,
+                                             // capabilities_and_extensions
+                                             R"(
+                                               OpCapability VulkanMemoryModelKHR
+                                               OpCapability SplitBarrierEXT
+                                               OpExtension "SPV_KHR_vulkan_memory_model"
+                                               OpExtension "SPV_EXT_split_barrier"
+                                             )",
+                                             // definitions
+                                             "",
+                                             // execution_model
+                                             "GLCompute",
+                                             // memory_model
+                                             "OpMemoryModel Logical VulkanKHR"),
+                      SPV_ENV_VULKAN_1_1);
+
+  ASSERT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions(SPV_ENV_VULKAN_1_1));
+  EXPECT_THAT(getDiagnosticString(),
+              AnyVUID("VUID-StandaloneSpirv-OpControlBarrierArriveEXT-13553"));
+  EXPECT_THAT(
+      getDiagnosticString(),
+      HasSubstr("The execution Scope for OpControlBarrierArriveEXT and "
+                "OpControlBarrierWaitEXT must be Workgroup or Subgroup"));
+}
+
+TEST_F(ValidateBarriers, OpControlBarrierWaitExecutionScope) {
+  const std::string body = R"(
+OpControlBarrierArriveEXT %workgroup %workgroup %release_workgroup_memory
+OpControlBarrierWaitEXT %invocation %workgroup %acquire_workgroup_memory
+)";
+
+  CompileSuccessfully(GenerateShaderCodeImpl(body,
+                                             // capabilities_and_extensions
+                                             R"(
+                                               OpCapability VulkanMemoryModelKHR
+                                               OpCapability SplitBarrierEXT
+                                               OpExtension "SPV_KHR_vulkan_memory_model"
+                                               OpExtension "SPV_EXT_split_barrier"
+                                             )",
+                                             // definitions
+                                             "",
+                                             // execution_model
+                                             "GLCompute",
+                                             // memory_model
+                                             "OpMemoryModel Logical VulkanKHR"),
+                      SPV_ENV_VULKAN_1_1);
+
+  ASSERT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions(SPV_ENV_VULKAN_1_1));
+  EXPECT_THAT(getDiagnosticString(),
+              AnyVUID("VUID-StandaloneSpirv-OpControlBarrierArriveEXT-13553"));
+  EXPECT_THAT(
+      getDiagnosticString(),
+      HasSubstr("The execution Scope for OpControlBarrierArriveEXT and "
+                "OpControlBarrierWaitEXT must be Workgroup or Subgroup"));
+}
+
 TEST_F(ValidateBarriers, OpControlBarrierArriveInvalidMemorySemantics) {
   const std::string body = R"(
 OpControlBarrierArriveEXT %workgroup %workgroup %acquire_release_workgroup