layers: Add TensorARM to descriptor heaps

- add check for VU 11457
- add type to existing unit tests

Author: stefano-bucciarelli-arm

layers/stateless/sl_descriptor.cpp

@@ -1687,6 +1687,12 @@ bool Device::manual_PreCallValidateWriteResourceDescriptorsEXT(VkDevice device,
                     }
                 }
             }
+        } else if (IsDescriptorHeapTensor(resource.type)) {
+            if (!resource.data.pTensorARM && !enabled_features.nullDescriptor) {
+                skip |= LogError("VUID-VkResourceDescriptorInfoEXT-None-11457", device, data_loc.dot(Field::pTensorARM),
+                                 "is NULL, but nullDescriptor feature is not enabled. (type is %s)",
+                                 string_VkDescriptorType(resource.type));
+            }
         } else {
             skip |= LogError("VUID-VkResourceDescriptorInfoEXT-type-11210", device, resource_loc.dot(Field::type),
                              "(%s) is not a supported type when using descriptor heaps.", string_VkDescriptorType(resource.type));

layers/utils/vk_api_utils.h

@@ -220,3 +220,7 @@ static constexpr bool IsDescriptorHeapImage(const VkDescriptorType type) {
            (type == VK_DESCRIPTOR_TYPE_SAMPLE_WEIGHT_IMAGE_QCOM) || (type == VK_DESCRIPTOR_TYPE_STORAGE_IMAGE) ||
            (type == VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT);
 }
+
+static constexpr bool IsDescriptorHeapTensor(const VkDescriptorType type) {
+    return (type == VK_DESCRIPTOR_TYPE_TENSOR_ARM);
+}

tests/icd/test_icd.cpp

@@ -2011,6 +2011,7 @@ static VKAPI_ATTR VkDeviceSize VKAPI_CALL GetPhysicalDeviceDescriptorSizeEXT(VkP
         case VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR:
         case VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NV:
         case VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT:
+        case VK_DESCRIPTOR_TYPE_TENSOR_ARM:
             return 256;
         default:
             break;

tests/unit/descriptor_heap.cpp

@@ -465,6 +465,8 @@ TEST_F(NegativeDescriptorHeap, ResourceParameterSize) {
 
 TEST_F(NegativeDescriptorHeap, ResourceParameterDataNull) {
     TEST_DESCRIPTION("Validate vkWriteResourceDescriptorsEXT null pointer");
+    AddRequiredExtensions(VK_ARM_TENSORS_EXTENSION_NAME);
+    AddRequiredFeature(vkt::Feature::tensors);
     RETURN_IF_SKIP(InitBasicDescriptorHeap());
 
     const struct {
@@ -483,7 +485,10 @@ TEST_F(NegativeDescriptorHeap, ResourceParameterDataNull) {
         {"VUID-VkResourceDescriptorInfoEXT-None-11213",
          std::vector<VkDescriptorType>{// checked in separate test VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR,
                                        // VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_NV,
-                                       VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER}}};
+                                       VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER}},
+        {"VUID-VkResourceDescriptorInfoEXT-None-11457",
+         std::vector<VkDescriptorType>{VK_DESCRIPTOR_TYPE_TENSOR_ARM}},
+    };
     for (const auto& s : subtests) {
         for (auto type : s.types) {
             const VkDeviceSize size = vk::GetPhysicalDeviceDescriptorSizeEXT(Gpu(), type);

tests/unit/descriptor_heap_positive.cpp

@@ -341,12 +341,15 @@ TEST_F(PositiveDescriptorHeap, GraphicsPushData) {
 TEST_F(PositiveDescriptorHeap, ResourceParameterDataNull) {
     TEST_DESCRIPTION("Validate vkWriteResourceDescriptorsEXT null pointer when nullDescriptor enabled");
     AddRequiredExtensions(VK_EXT_ROBUSTNESS_2_EXTENSION_NAME);
+    AddRequiredExtensions(VK_ARM_TENSORS_EXTENSION_NAME);
     AddRequiredFeature(vkt::Feature::nullDescriptor);
+    AddRequiredFeature(vkt::Feature::tensors);
     RETURN_IF_SKIP(InitBasicDescriptorHeap());
 
     std::vector<VkDescriptorType> types{VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE,        VK_DESCRIPTOR_TYPE_STORAGE_IMAGE,
                                         VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER, VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER,
-                                        VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,       VK_DESCRIPTOR_TYPE_STORAGE_BUFFER};
+                                        VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER,       VK_DESCRIPTOR_TYPE_STORAGE_BUFFER,
+                                        VK_DESCRIPTOR_TYPE_TENSOR_ARM};
     for (auto type : types) {
         const VkDeviceSize size = vk::GetPhysicalDeviceDescriptorSizeEXT(Gpu(), type);
         auto data = std::make_unique<uint8_t[]>(static_cast<size_t>(size));
@@ -355,7 +358,7 @@ TEST_F(PositiveDescriptorHeap, ResourceParameterDataNull) {
         resource_desc_info.type = type;
         VkHostAddressRangeEXT descriptors = {data.get(), static_cast<size_t>(size)};
 
-        // We do not expect error messages due to nullDescriptor enables pTexelBuffer, pAddressRange, pImage to be null
+        // We do not expect error messages due to nullDescriptor enables pTexelBuffer, pAddressRange, pImage, pTensorARM to be null
         vk::WriteResourceDescriptorsEXT(device(), 1u, &resource_desc_info, &descriptors);
     }
 }