Fixes to pipeline barrier tests

- Skip memory types if they don't support any operations.
- Add 8K and 64K memory size groups to increase coverage on implementations
  that always require more than 1K of memory for each buffer and texture.

Change-Id: I4e1ef2ce5862def8f3b09e6ae855ef9f704a808e

diff --git a/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp b/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp
index c27ee15cddd5e724189be07e399a9e2e930d7a66..62700c6ffa10678c28ae7aeefb5e47c3eeb8721d 100644 (file)
--- a/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp
+++ b/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp
@@ -6332,7 +6332,18 @@ tcu::TestStatus MemoryTestInstance::iterate (void)
 
                                log << TestLog::Message << "Max buffer size: " << maxBufferSize << TestLog::EndMessage;
                                log << TestLog::Message << "Max RGBA8 image size: " << maxImageSize << TestLog::EndMessage;
-                               testCommand(log, m_resultCollector, m_context.getBinaryCollection(), vki, vkd, physicalDevice, device, m_config.size, m_memoryTypeNdx, m_config.usage, m_config.sharing, queue, queueFamilyIndex, queues, maxBufferSize, maxImageSize);
+
+                               // Skip tests if there are no supported operations
+                               if (maxBufferSize == 0
+                                       && maxImageSize[0] == 0
+                                       && (m_config.usage & (USAGE_HOST_READ|USAGE_HOST_WRITE)) == 0)
+                               {
+                                       log << TestLog::Message << "Skipping memory type. None of the usages are supported." << TestLog::EndMessage;
+                               }
+                               else
+                               {
+                                       testCommand(log, m_resultCollector, m_context.getBinaryCollection(), vki, vkd, physicalDevice, device, m_config.size, m_memoryTypeNdx, m_config.usage, m_config.sharing, queue, queueFamilyIndex, queues, maxBufferSize, maxImageSize);
+                               }
                        }
                        catch (const tcu::TestError& e)
                        {
@@ -6403,8 +6414,10 @@ tcu::TestCaseGroup* createPipelineBarrierTests (tcu::TestContext& testCtx)
        de::MovePtr<tcu::TestCaseGroup> group                   (new tcu::TestCaseGroup(testCtx, "pipeline_barrier", "Pipeline barrier tests."));
        const vk::VkDeviceSize                  sizes[]                 =
        {
-               1024,
-               1024*1024,
+               1024,                   // 1K
+               8*1024,                 // 8K
+               64*1024,                // 64K
+               1024*1024,              // 1M
        };
        const Usage                                             usages[]                =
        {