Remove conformance version test from Android

Removes conformance version tests from android CTS.

Split tests designed to validate VK_KHR_driver_properties
into several smaller tests.

Add three more records into knownDriverIds.

Add:
 * dEQP-VK.api.driver_properties.*

Remove:
 * dEQP-VK.api.driver_properties

Components: vulkan

VK-GL-CTS issue: 1839

Change-Id: I9b591778c9833fd890c9af46cb87d9f5eb695dbd

diff --git a/android/cts/master/src/vk-excluded-tests.txt b/android/cts/master/src/vk-excluded-tests.txt
index b874e55..7175f4f 100644 (file)
--- a/android/cts/master/src/vk-excluded-tests.txt
+++ b/android/cts/master/src/vk-excluded-tests.txt
@@ -67,3 +67,6 @@ dEQP-VK.wsi.android.incremental_present.scale_down.*
 
 # Excluded VkRunner example tests
 dEQP-VK.vkrunner-example.*
+
+# Exclude conformance version from android test, issue 1839
+dEQP-VK.api.driver_properties.conformance_version

diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index 2f1ec41..1ba6194 100755 (executable)
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -4,7 +4,10 @@ dEQP-VK.info.platform
 dEQP-VK.info.memory_limits
 dEQP-VK.api.version_check.version
 dEQP-VK.api.version_check.entry_points
-dEQP-VK.api.driver_properties.properties
+dEQP-VK.api.driver_properties.driver_id_match
+dEQP-VK.api.driver_properties.name_is_not_empty
+dEQP-VK.api.driver_properties.name_zero_terminated
+dEQP-VK.api.driver_properties.info_zero_terminated
 dEQP-VK.api.smoke.create_sampler
 dEQP-VK.api.smoke.create_shader
 dEQP-VK.api.smoke.triangle

diff --git a/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp b/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
index 248fbe6..568b9e7 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
@@ -37,6 +37,15 @@ namespace api
 namespace
 {
 
+enum TestType
+{
+       TEST_TYPE_DRIVER_ID_MATCH                       = 0,
+       TEST_TYPE_NAME_IS_NOT_EMPTY,
+       TEST_TYPE_NAME_ZERO_TERMINATED,
+       TEST_TYPE_INFO_ZERO_TERMINATED,
+       TEST_TYPE_VERSION,
+};
+
 static const deUint32 knownDriverIds[] =
 {
        // Specified in the Vulkan registry (vk.xml)
@@ -49,6 +58,9 @@ static const deUint32 knownDriverIds[] =
        7,      // author = "Imagination Technologies"       comment = "Imagination proprietary driver"
        8,      // author = "Qualcomm Technologies, Inc."    comment = "Qualcomm proprietary driver"
        9,      // author = "Arm Limited"                    comment = "Arm proprietary driver"
+       10,     // <enum value="10"      name="VK_DRIVER_ID_GOOGLE_SWIFTSHADER_KHR"        comment="Google LLC"/>
+       11,     // <enum value="11"      name="VK_DRIVER_ID_GGP_PROPRIETARY_KHR"           comment="Google LLC"/>
+       12,     // <enum value="12"      name="VK_DRIVER_ID_BROADCOM_PROPRIETARY_KHR"      comment="Broadcom Inc."/>
 };
 
 static const VkConformanceVersionKHR knownConformanceVersions[] =
@@ -87,15 +99,60 @@ DE_INLINE bool operator==(const VkConformanceVersionKHR& a, const VkConformanceV
                        (a.patch == b.patch));
 }
 
-tcu::TestStatus testQueryProperties (Context& context)
+void checkSupport (Context& context, const TestType config)
 {
-       // Check extension support
+       DE_UNREF(config);
 
+       // Check extension support
        if (!isDeviceExtensionSupported(context.getUsedApiVersion(), context.getDeviceExtensions(), "VK_KHR_driver_properties"))
                TCU_THROW(NotSupportedError, "Unsupported extension: VK_KHR_driver_properties");
+}
 
-       // Query the driver properties
+void testDriverMatch (const VkPhysicalDeviceDriverPropertiesKHR& deviceDriverProperties)
+{
+       for (const deUint32* pDriverId = knownDriverIds; pDriverId != DE_ARRAY_END(knownDriverIds); ++pDriverId)
+       {
+               if (deviceDriverProperties.driverID == *pDriverId)
+                       return;
+       }
+
+       TCU_FAIL("Driver ID did not match any known driver");
+}
+
+void testNameIsNotEmpty (const VkPhysicalDeviceDriverPropertiesKHR& deviceDriverProperties)
+{
+       if (deviceDriverProperties.driverName[0] == 0)
+               TCU_FAIL("Driver name is empty");
+}
+
+void testNameZeroTerminated (const VkPhysicalDeviceDriverPropertiesKHR& deviceDriverProperties)
+{
+       if (!isNullTerminated(deviceDriverProperties.driverName, VK_MAX_DRIVER_NAME_SIZE_KHR))
+               TCU_FAIL("Driver name is not a null-terminated string");
+}
+
+void testInfoZeroTerminated (const VkPhysicalDeviceDriverPropertiesKHR& deviceDriverProperties)
+{
+       if (!isNullTerminated(deviceDriverProperties.driverInfo, VK_MAX_DRIVER_INFO_SIZE_KHR))
+               TCU_FAIL("Driver info is not a null-terminated string");
+}
+
+void testVersion (const VkPhysicalDeviceDriverPropertiesKHR& deviceDriverProperties)
+{
+       for (const VkConformanceVersionKHR* pConformanceVersion  = knownConformanceVersions;
+                                                                               pConformanceVersion != DE_ARRAY_END(knownConformanceVersions);
+                                                                         ++pConformanceVersion)
+       {
+               if (deviceDriverProperties.conformanceVersion == *pConformanceVersion)
+                       return;
+       }
 
+       TCU_FAIL("Wrong driver conformance version");
+}
+
+tcu::TestStatus testQueryProperties (Context& context, const TestType testType)
+{
+       // Query the driver properties
        const VkPhysicalDevice                          physDevice                      = context.getPhysicalDevice();
        const int                                                       memsetPattern           = 0xaa;
        VkPhysicalDeviceProperties2                     deviceProperties2;
@@ -112,51 +169,26 @@ tcu::TestStatus testQueryProperties (Context& context)
        context.getInstanceInterface().getPhysicalDeviceProperties2(physDevice, &deviceProperties2);
 
        // Verify the returned values
-
-       bool match = false;
-
-       for (const deUint32* pDriverId = knownDriverIds; (pDriverId != DE_ARRAY_END(knownDriverIds)) && !match; ++pDriverId)
+       switch (testType)
        {
-               if (deviceDriverProperties.driverID == *pDriverId)
-               {
-                       match = true;
-
-                       if (!isNullTerminated(deviceDriverProperties.driverName, VK_MAX_DRIVER_NAME_SIZE_KHR))
-                               TCU_FAIL("Driver name is not a null-terminated string");
-
-                       if (deviceDriverProperties.driverName[0] == 0)
-                               TCU_FAIL("Driver name is empty");
-
-                       if (!isNullTerminated(deviceDriverProperties.driverInfo, VK_MAX_DRIVER_INFO_SIZE_KHR))
-                               TCU_FAIL("Driver info is not a null-terminated string");
-
-                       bool conformanceVersionMatch = false;
-
-                       for (const VkConformanceVersionKHR* pConformanceVersion  = knownConformanceVersions;
-                                                                                               pConformanceVersion != DE_ARRAY_END(knownConformanceVersions);
-                                                                                         ++pConformanceVersion)
-                       {
-                               if (deviceDriverProperties.conformanceVersion == *pConformanceVersion)
-                               {
-                                       conformanceVersionMatch = true;
-                                       break;
-                               }
-                       }
-
-                       if (!conformanceVersionMatch)
-                               TCU_FAIL("Wrong driver conformance version");
-               }
+               case TEST_TYPE_DRIVER_ID_MATCH:                 testDriverMatch                 (deviceDriverProperties);       break;
+               case TEST_TYPE_NAME_IS_NOT_EMPTY:               testNameIsNotEmpty              (deviceDriverProperties);       break;
+               case TEST_TYPE_NAME_ZERO_TERMINATED:    testNameZeroTerminated  (deviceDriverProperties);       break;
+               case TEST_TYPE_INFO_ZERO_TERMINATED:    testInfoZeroTerminated  (deviceDriverProperties);       break;
+               case TEST_TYPE_VERSION:                                 testVersion                             (deviceDriverProperties);       break;
+               default:                                                                TCU_THROW(InternalError, "Unknown test type specified");
        }
 
-       if (!match)
-               TCU_FAIL("Driver ID did not match any known driver");
-
        return tcu::TestStatus::pass("Pass");
 }
 
 void createTestCases (tcu::TestCaseGroup* group)
 {
-       addFunctionCase(group, "properties", "Query VkPhysicalDeviceDriverPropertiesKHR and check its values", testQueryProperties);
+       addFunctionCase(group, "driver_id_match",               "Check driverID is supported",                                  checkSupport,   testQueryProperties,    TEST_TYPE_DRIVER_ID_MATCH);
+       addFunctionCase(group, "name_is_not_empty",             "Check name field is not empty",                                checkSupport,   testQueryProperties,    TEST_TYPE_NAME_IS_NOT_EMPTY);
+       addFunctionCase(group, "name_zero_terminated",  "Check name field is zero-terminated",                  checkSupport,   testQueryProperties,    TEST_TYPE_NAME_ZERO_TERMINATED);
+       addFunctionCase(group, "info_zero_terminated",  "Check info field is zero-terminated",                  checkSupport,   testQueryProperties,    TEST_TYPE_INFO_ZERO_TERMINATED);
+       addFunctionCase(group, "conformance_version",   "Check conformanceVersion reported by driver",  checkSupport,   testQueryProperties,    TEST_TYPE_VERSION);
 }
 
 } // anonymous

diff --git a/external/vulkancts/mustpass/1.1.2/src/master.txt b/external/vulkancts/mustpass/1.1.2/src/master.txt
index 75f311b..6df5b78 100644 (file)
--- a/external/vulkancts/mustpass/1.1.2/src/master.txt
+++ b/external/vulkancts/mustpass/1.1.2/src/master.txt
@@ -4,7 +4,11 @@ dEQP-VK.info.platform
 dEQP-VK.info.memory_limits
 dEQP-VK.api.version_check.version
 dEQP-VK.api.version_check.entry_points
-dEQP-VK.api.driver_properties.properties
+dEQP-VK.api.driver_properties.driver_id_match
+dEQP-VK.api.driver_properties.name_is_not_empty
+dEQP-VK.api.driver_properties.name_zero_terminated
+dEQP-VK.api.driver_properties.info_zero_terminated
+dEQP-VK.api.driver_properties.conformance_version
 dEQP-VK.api.smoke.create_sampler
 dEQP-VK.api.smoke.create_shader
 dEQP-VK.api.smoke.triangle

diff --git a/external/vulkancts/mustpass/1.1.2/vk-default-no-waivers.txt b/external/vulkancts/mustpass/1.1.2/vk-default-no-waivers.txt
index 5c53c88..3237f90 100644 (file)
--- a/external/vulkancts/mustpass/1.1.2/vk-default-no-waivers.txt
+++ b/external/vulkancts/mustpass/1.1.2/vk-default-no-waivers.txt
@@ -4,7 +4,11 @@ dEQP-VK.info.platform
 dEQP-VK.info.memory_limits
 dEQP-VK.api.version_check.version
 dEQP-VK.api.version_check.entry_points
-dEQP-VK.api.driver_properties.properties
+dEQP-VK.api.driver_properties.driver_id_match
+dEQP-VK.api.driver_properties.name_is_not_empty
+dEQP-VK.api.driver_properties.name_zero_terminated
+dEQP-VK.api.driver_properties.info_zero_terminated
+dEQP-VK.api.driver_properties.conformance_version
 dEQP-VK.api.smoke.create_sampler
 dEQP-VK.api.smoke.create_shader
 dEQP-VK.api.smoke.triangle

diff --git a/external/vulkancts/mustpass/1.1.2/vk-default.txt b/external/vulkancts/mustpass/1.1.2/vk-default.txt
index 85a80df..4989809 100644 (file)
--- a/external/vulkancts/mustpass/1.1.2/vk-default.txt
+++ b/external/vulkancts/mustpass/1.1.2/vk-default.txt
@@ -4,7 +4,11 @@ dEQP-VK.info.platform
 dEQP-VK.info.memory_limits
 dEQP-VK.api.version_check.version
 dEQP-VK.api.version_check.entry_points
-dEQP-VK.api.driver_properties.properties
+dEQP-VK.api.driver_properties.driver_id_match
+dEQP-VK.api.driver_properties.name_is_not_empty
+dEQP-VK.api.driver_properties.name_zero_terminated
+dEQP-VK.api.driver_properties.info_zero_terminated
+dEQP-VK.api.driver_properties.conformance_version
 dEQP-VK.api.smoke.create_sampler
 dEQP-VK.api.smoke.create_shader
 dEQP-VK.api.smoke.triangle

diff --git a/external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt b/external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
index b8bc473..24aa466 100644 (file)
--- a/external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
+++ b/external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
@@ -4,7 +4,11 @@ dEQP-VK.info.platform
 dEQP-VK.info.memory_limits
 dEQP-VK.api.version_check.version
 dEQP-VK.api.version_check.entry_points
-dEQP-VK.api.driver_properties.properties
+dEQP-VK.api.driver_properties.driver_id_match
+dEQP-VK.api.driver_properties.name_is_not_empty
+dEQP-VK.api.driver_properties.name_zero_terminated
+dEQP-VK.api.driver_properties.info_zero_terminated
+dEQP-VK.api.driver_properties.conformance_version
 dEQP-VK.api.smoke.create_sampler
 dEQP-VK.api.smoke.create_shader
 dEQP-VK.api.smoke.triangle

diff --git a/external/vulkancts/mustpass/1.1.3/vk-default.txt b/external/vulkancts/mustpass/1.1.3/vk-default.txt
index 0b82230..f8a63c3 100644 (file)
--- a/external/vulkancts/mustpass/1.1.3/vk-default.txt
+++ b/external/vulkancts/mustpass/1.1.3/vk-default.txt
@@ -4,7 +4,11 @@ dEQP-VK.info.platform
 dEQP-VK.info.memory_limits
 dEQP-VK.api.version_check.version
 dEQP-VK.api.version_check.entry_points
-dEQP-VK.api.driver_properties.properties
+dEQP-VK.api.driver_properties.driver_id_match
+dEQP-VK.api.driver_properties.name_is_not_empty
+dEQP-VK.api.driver_properties.name_zero_terminated
+dEQP-VK.api.driver_properties.info_zero_terminated
+dEQP-VK.api.driver_properties.conformance_version
 dEQP-VK.api.smoke.create_sampler
 dEQP-VK.api.smoke.create_shader
 dEQP-VK.api.smoke.triangle