Move part of the dEQP-VK.api.info.* tests into new place

Moving dEQP-VK.api.info.device.* and
dEQP-VK.api.info.instance.* tests to dEQP-VK.info.*.

Affects tests:
dEQP-VK.api.info.*
dEQP-VK.info.*

Components: Vulkan

VK-GL-CTS issue: 1897

Change-Id: I89d61bf320e39ed4660f6ac3073a8c7372bd8b56

diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index e61e7c4..b251dcb 100644 (file)
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -2,6 +2,20 @@ dEQP-VK.info.build
 dEQP-VK.info.device
 dEQP-VK.info.platform
 dEQP-VK.info.memory_limits
+dEQP-VK.info.physical_devices
+dEQP-VK.info.physical_device_groups
+dEQP-VK.info.instance_layers
+dEQP-VK.info.instance_extensions
+dEQP-VK.info.device_features
+dEQP-VK.info.device_properties
+dEQP-VK.info.device_queue_family_properties
+dEQP-VK.info.device_memory_properties
+dEQP-VK.info.device_layers
+dEQP-VK.info.device_extensions
+dEQP-VK.info.device_no_khx_extensions
+dEQP-VK.info.device_memory_budget
+dEQP-VK.info.device_mandatory_features
+dEQP-VK.info.device_group_peer_memory_features
 dEQP-VK.api.version_check.version
 dEQP-VK.api.version_check.entry_points
 dEQP-VK.api.driver_properties.driver_id_match
@@ -15,20 +29,6 @@ dEQP-VK.api.smoke.triangle_ext_structs
 dEQP-VK.api.smoke.asm_triangle
 dEQP-VK.api.smoke.asm_triangle_no_opname
 dEQP-VK.api.smoke.unused_resolve_attachment
-dEQP-VK.api.info.instance.physical_devices
-dEQP-VK.api.info.instance.physical_device_groups
-dEQP-VK.api.info.instance.layers
-dEQP-VK.api.info.instance.extensions
-dEQP-VK.api.info.device.features
-dEQP-VK.api.info.device.properties
-dEQP-VK.api.info.device.queue_family_properties
-dEQP-VK.api.info.device.memory_properties
-dEQP-VK.api.info.device.layers
-dEQP-VK.api.info.device.extensions
-dEQP-VK.api.info.device.no_khx_extensions
-dEQP-VK.api.info.device.memory_budget
-dEQP-VK.api.info.device.mandatory_features
-dEQP-VK.api.info.device_group.peer_memory_features
 dEQP-VK.api.info.format_properties.r4g4_unorm_pack8
 dEQP-VK.api.info.format_properties.r4g4b4a4_unorm_pack16
 dEQP-VK.api.info.format_properties.b4g4r4a4_unorm_pack16

diff --git a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
index e0d0b6f..62280d8 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
@@ -3628,41 +3628,6 @@ tcu::TestCaseGroup* createFeatureInfoTests (tcu::TestContext& testCtx)
 {
        de::MovePtr<tcu::TestCaseGroup> infoTests       (new tcu::TestCaseGroup(testCtx, "info", "Platform Information Tests"));
 
-       {
-               de::MovePtr<tcu::TestCaseGroup> instanceInfoTests       (new tcu::TestCaseGroup(testCtx, "instance", "Instance Information Tests"));
-
-               addFunctionCase(instanceInfoTests.get(), "physical_devices",            "Physical devices",                     enumeratePhysicalDevices);
-               addFunctionCase(instanceInfoTests.get(), "physical_device_groups",      "Physical devices Groups",      enumeratePhysicalDeviceGroups);
-               addFunctionCase(instanceInfoTests.get(), "layers",                                      "Layers",                                       enumerateInstanceLayers);
-               addFunctionCase(instanceInfoTests.get(), "extensions",                          "Extensions",                           enumerateInstanceExtensions);
-
-               infoTests->addChild(instanceInfoTests.release());
-       }
-
-       {
-               de::MovePtr<tcu::TestCaseGroup> deviceInfoTests (new tcu::TestCaseGroup(testCtx, "device", "Device Information Tests"));
-
-               addFunctionCase(deviceInfoTests.get(), "features",                                      "Device Features",                      deviceFeatures);
-               addFunctionCase(deviceInfoTests.get(), "properties",                            "Device Properties",            deviceProperties);
-               addFunctionCase(deviceInfoTests.get(), "queue_family_properties",       "Queue family properties",      deviceQueueFamilyProperties);
-               addFunctionCase(deviceInfoTests.get(), "memory_properties",                     "Memory properties",            deviceMemoryProperties);
-               addFunctionCase(deviceInfoTests.get(), "layers",                                        "Layers",                                       enumerateDeviceLayers);
-               addFunctionCase(deviceInfoTests.get(), "extensions",                            "Extensions",                           enumerateDeviceExtensions);
-               addFunctionCase(deviceInfoTests.get(), "no_khx_extensions",                     "KHX extensions",                       testNoKhxExtensions);
-               addFunctionCase(deviceInfoTests.get(), "memory_budget",                         "Memory budget",                        deviceMemoryBudgetProperties);
-               addFunctionCase(deviceInfoTests.get(), "mandatory_features",            "Mandatory features",           deviceMandatoryFeatures);
-
-               infoTests->addChild(deviceInfoTests.release());
-       }
-
-       {
-               de::MovePtr<tcu::TestCaseGroup> deviceGroupInfoTests(new tcu::TestCaseGroup(testCtx, "device_group", "Device Group Information Tests"));
-
-               addFunctionCase(deviceGroupInfoTests.get(), "peer_memory_features",     "Device Group peer memory features",                            deviceGroupPeerMemoryFeatures);
-
-               infoTests->addChild(deviceGroupInfoTests.release());
-       }
-
        infoTests->addChild(createTestGroup(testCtx, "format_properties",               "VkGetPhysicalDeviceFormatProperties() Tests",          createFormatTests));
        infoTests->addChild(createTestGroup(testCtx, "image_format_properties", "VkGetPhysicalDeviceImageFormatProperties() Tests",     createImageFormatTests, imageFormatProperties));
 
@@ -3694,5 +3659,31 @@ tcu::TestCaseGroup* createFeatureInfoTests (tcu::TestContext& testCtx)
        return infoTests.release();
 }
 
+void createFeatureInfoInstanceTests(tcu::TestCaseGroup* testGroup)
+{
+       addFunctionCase(testGroup, "physical_devices",                                  "Physical devices",                                             enumeratePhysicalDevices);
+       addFunctionCase(testGroup, "physical_device_groups",                    "Physical devices Groups",                              enumeratePhysicalDeviceGroups);
+       addFunctionCase(testGroup, "instance_layers",                                   "Layers",                                                               enumerateInstanceLayers);
+       addFunctionCase(testGroup, "instance_extensions",                               "Extensions",                                                   enumerateInstanceExtensions);
+}
+
+void createFeatureInfoDeviceTests(tcu::TestCaseGroup* testGroup)
+{
+       addFunctionCase(testGroup, "device_features",                                   "Device Features",                                              deviceFeatures);
+       addFunctionCase(testGroup, "device_properties",                                 "Device Properties",                                    deviceProperties);
+       addFunctionCase(testGroup, "device_queue_family_properties",    "Queue family properties",                              deviceQueueFamilyProperties);
+       addFunctionCase(testGroup, "device_memory_properties",                  "Memory properties",                                    deviceMemoryProperties);
+       addFunctionCase(testGroup, "device_layers",                                             "Layers",                                                               enumerateDeviceLayers);
+       addFunctionCase(testGroup, "device_extensions",                                 "Extensions",                                                   enumerateDeviceExtensions);
+       addFunctionCase(testGroup, "device_no_khx_extensions",                  "KHX extensions",                                               testNoKhxExtensions);
+       addFunctionCase(testGroup, "device_memory_budget",                              "Memory budget",                                                deviceMemoryBudgetProperties);
+       addFunctionCase(testGroup, "device_mandatory_features",                 "Mandatory features",                                   deviceMandatoryFeatures);
+}
+
+void createFeatureInfoDeviceGroupTests(tcu::TestCaseGroup* testGroup)
+{
+       addFunctionCase(testGroup, "device_group_peer_memory_features", "Device Group peer memory features",    deviceGroupPeerMemoryFeatures);
+}
+
 } // api
 } // vkt

diff --git a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.hpp b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.hpp
index 8b9eb58..aa0e1a6 100644 (file)
--- a/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.hpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.hpp
@@ -31,7 +31,10 @@ namespace vkt
 namespace api
 {
 
-tcu::TestCaseGroup*            createFeatureInfoTests          (tcu::TestContext& testCtx);
+tcu::TestCaseGroup*            createFeatureInfoTests                          (tcu::TestContext& testCtx);
+void                                   createFeatureInfoInstanceTests          (tcu::TestCaseGroup* testGroup);
+void                                   createFeatureInfoDeviceTests            (tcu::TestCaseGroup* testGroup);
+void                                   createFeatureInfoDeviceGroupTests       (tcu::TestCaseGroup* testGroup);
 
 } // api
 } // vkt

diff --git a/external/vulkancts/modules/vulkan/vktInfoTests.cpp b/external/vulkancts/modules/vulkan/vktInfoTests.cpp
index 666c62d..9797bfb 100644 (file)
--- a/external/vulkancts/modules/vulkan/vktInfoTests.cpp
+++ b/external/vulkancts/modules/vulkan/vktInfoTests.cpp
@@ -30,6 +30,7 @@
 #include "tcuCommandLine.hpp"
 #include "tcuPlatform.hpp"
 #include "deStringUtil.hpp"
+#include "vktApiFeatureInfo.hpp"
 
 #include <iomanip>
 
@@ -243,6 +244,10 @@ void createInfoTests (tcu::TestCaseGroup* testGroup)
        addFunctionCase(testGroup, "device",            "Device Info",                          logDeviceInfo);
        addFunctionCase(testGroup, "platform",          "Platform Info",                        logPlatformInfo);
        addFunctionCase(testGroup, "memory_limits",     "Platform Memory Limits",       logPlatformMemoryLimits);
+
+       api::createFeatureInfoInstanceTests             (testGroup);
+       api::createFeatureInfoDeviceTests               (testGroup);
+       api::createFeatureInfoDeviceGroupTests  (testGroup);
 }
 
 } // vkt

diff --git a/external/vulkancts/mustpass/master/vk-default-no-waivers.txt b/external/vulkancts/mustpass/master/vk-default-no-waivers.txt
index ebe20ae..8043588 100644 (file)
--- a/external/vulkancts/mustpass/master/vk-default-no-waivers.txt
+++ b/external/vulkancts/mustpass/master/vk-default-no-waivers.txt
@@ -2,6 +2,20 @@ dEQP-VK.info.build
 dEQP-VK.info.device
 dEQP-VK.info.platform
 dEQP-VK.info.memory_limits
+dEQP-VK.info.physical_devices
+dEQP-VK.info.physical_device_groups
+dEQP-VK.info.instance_layers
+dEQP-VK.info.instance_extensions
+dEQP-VK.info.device_features
+dEQP-VK.info.device_properties
+dEQP-VK.info.device_queue_family_properties
+dEQP-VK.info.device_memory_properties
+dEQP-VK.info.device_layers
+dEQP-VK.info.device_extensions
+dEQP-VK.info.device_no_khx_extensions
+dEQP-VK.info.device_memory_budget
+dEQP-VK.info.device_mandatory_features
+dEQP-VK.info.device_group_peer_memory_features
 dEQP-VK.api.version_check.version
 dEQP-VK.api.version_check.entry_points
 dEQP-VK.api.driver_properties.driver_id_match
@@ -16,20 +30,6 @@ dEQP-VK.api.smoke.triangle_ext_structs
 dEQP-VK.api.smoke.asm_triangle
 dEQP-VK.api.smoke.asm_triangle_no_opname
 dEQP-VK.api.smoke.unused_resolve_attachment
-dEQP-VK.api.info.instance.physical_devices
-dEQP-VK.api.info.instance.physical_device_groups
-dEQP-VK.api.info.instance.layers
-dEQP-VK.api.info.instance.extensions
-dEQP-VK.api.info.device.features
-dEQP-VK.api.info.device.properties
-dEQP-VK.api.info.device.queue_family_properties
-dEQP-VK.api.info.device.memory_properties
-dEQP-VK.api.info.device.layers
-dEQP-VK.api.info.device.extensions
-dEQP-VK.api.info.device.no_khx_extensions
-dEQP-VK.api.info.device.memory_budget
-dEQP-VK.api.info.device.mandatory_features
-dEQP-VK.api.info.device_group.peer_memory_features
 dEQP-VK.api.info.format_properties.r4g4_unorm_pack8
 dEQP-VK.api.info.format_properties.r4g4b4a4_unorm_pack16
 dEQP-VK.api.info.format_properties.b4g4r4a4_unorm_pack16

diff --git a/external/vulkancts/mustpass/master/vk-default.txt b/external/vulkancts/mustpass/master/vk-default.txt
index f64cdb5..2eea291 100644 (file)
--- a/external/vulkancts/mustpass/master/vk-default.txt
+++ b/external/vulkancts/mustpass/master/vk-default.txt
@@ -2,6 +2,20 @@ dEQP-VK.info.build
 dEQP-VK.info.device
 dEQP-VK.info.platform
 dEQP-VK.info.memory_limits
+dEQP-VK.info.physical_devices
+dEQP-VK.info.physical_device_groups
+dEQP-VK.info.instance_layers
+dEQP-VK.info.instance_extensions
+dEQP-VK.info.device_features
+dEQP-VK.info.device_properties
+dEQP-VK.info.device_queue_family_properties
+dEQP-VK.info.device_memory_properties
+dEQP-VK.info.device_layers
+dEQP-VK.info.device_extensions
+dEQP-VK.info.device_no_khx_extensions
+dEQP-VK.info.device_memory_budget
+dEQP-VK.info.device_mandatory_features
+dEQP-VK.info.device_group_peer_memory_features
 dEQP-VK.api.version_check.version
 dEQP-VK.api.version_check.entry_points
 dEQP-VK.api.driver_properties.driver_id_match
@@ -16,20 +30,6 @@ dEQP-VK.api.smoke.triangle_ext_structs
 dEQP-VK.api.smoke.asm_triangle
 dEQP-VK.api.smoke.asm_triangle_no_opname
 dEQP-VK.api.smoke.unused_resolve_attachment
-dEQP-VK.api.info.instance.physical_devices
-dEQP-VK.api.info.instance.physical_device_groups
-dEQP-VK.api.info.instance.layers
-dEQP-VK.api.info.instance.extensions
-dEQP-VK.api.info.device.features
-dEQP-VK.api.info.device.properties
-dEQP-VK.api.info.device.queue_family_properties
-dEQP-VK.api.info.device.memory_properties
-dEQP-VK.api.info.device.layers
-dEQP-VK.api.info.device.extensions
-dEQP-VK.api.info.device.no_khx_extensions
-dEQP-VK.api.info.device.memory_budget
-dEQP-VK.api.info.device.mandatory_features
-dEQP-VK.api.info.device_group.peer_memory_features
 dEQP-VK.api.info.format_properties.r4g4_unorm_pack8
 dEQP-VK.api.info.format_properties.r4g4b4a4_unorm_pack16
 dEQP-VK.api.info.format_properties.b4g4r4a4_unorm_pack16