From 1303dab32354169115d0c1b859ac70a9bb162af9 Mon Sep 17 00:00:00 2001 From: spencer-lunarg Date: Fri, 7 Jun 2024 07:57:54 -0500 Subject: [PATCH] tests: Re-enable DISABLED tests --- tests/unit/buffer_positive.cpp | 4 +- tests/unit/copy_buffer_image.cpp | 2 +- tests/unit/instanceless.cpp | 3 +- tests/unit/object_lifetime.cpp | 19 ----- tests/unit/pipeline.cpp | 3 +- tests/unit/pipeline_positive.cpp | 4 +- tests/unit/query.cpp | 115 ------------------------------- tests/unit/subgroups.cpp | 3 +- 8 files changed, 8 insertions(+), 145 deletions(-) diff --git a/tests/unit/buffer_positive.cpp b/tests/unit/buffer_positive.cpp index c45fd818e04..d9579971a52 100644 --- a/tests/unit/buffer_positive.cpp +++ b/tests/unit/buffer_positive.cpp @@ -87,7 +87,7 @@ TEST_F(PositiveBuffer, TexelBufferAlignmentIn13) { CreateBufferViewTest(*this, &buff_view_ci, {}); } -TEST_F(PositiveBuffer, DISABLED_PerfGetBufferAddressWorstCase) { +TEST_F(PositiveBuffer, PerfGetBufferAddressWorstCase) { TEST_DESCRIPTION("Add elements to buffer_address_map, worst case scenario"); SetTargetApiVersion(VK_API_VERSION_1_1); @@ -130,7 +130,7 @@ TEST_F(PositiveBuffer, DISABLED_PerfGetBufferAddressWorstCase) { } } -TEST_F(PositiveBuffer, DISABLED_PerfGetBufferAddressGoodCase) { +TEST_F(PositiveBuffer, PerfGetBufferAddressGoodCase) { TEST_DESCRIPTION("Add elements to buffer_address_map, good case scenario"); SetTargetApiVersion(VK_API_VERSION_1_1); diff --git a/tests/unit/copy_buffer_image.cpp b/tests/unit/copy_buffer_image.cpp index 9a93509fc76..8ccfce8e29c 100644 --- a/tests/unit/copy_buffer_image.cpp +++ b/tests/unit/copy_buffer_image.cpp @@ -2404,7 +2404,7 @@ TEST_F(NegativeCopyBufferImage, CopyCommands2V13) { m_errorMonitor->VerifyFound(); } -// TODO 6898 +// TODO https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/6898 TEST_F(NegativeCopyBufferImage, DISABLED_ImageOverlappingMemory) { TEST_DESCRIPTION("Validate Copy Image from/to Buffer with overlapping memory"); SetTargetApiVersion(VK_API_VERSION_1_3); diff --git a/tests/unit/instanceless.cpp b/tests/unit/instanceless.cpp index d303c2ef759..68a7691b185 100644 --- a/tests/unit/instanceless.cpp +++ b/tests/unit/instanceless.cpp @@ -250,8 +250,7 @@ TEST_F(NegativeInstanceless, DestroyInstanceAllocationCallbacksCompatibility) { } } -// TODO - Currently can not be ran with Profile layer -TEST_F(NegativeInstanceless, DISABLED_DestroyInstanceHandleLeak) { +TEST_F(NegativeInstanceless, DestroyInstanceHandleLeak) { TEST_DESCRIPTION("Test vkDestroyInstance while leaking a VkDevice object."); RETURN_IF_SKIP(InitFramework()); if (!IsPlatformMockICD()) { diff --git a/tests/unit/object_lifetime.cpp b/tests/unit/object_lifetime.cpp index f5c0cae3c87..6674e025d84 100644 --- a/tests/unit/object_lifetime.cpp +++ b/tests/unit/object_lifetime.cpp @@ -20,25 +20,6 @@ #include "../framework/descriptor_helper.h" #include "../framework/external_memory_sync.h" -// Validation of dispatchable handles is not performed until VVL's chassis will be -// able to do this validation (if ever) instead of crashing (which is also an option). -// If vulkan's loader trampoline is active, then it's also the place where invalid -// dispatchable handle can cause a crash. -TEST_F(NegativeObjectLifetime, DISABLED_CreateBufferUsingInvalidDevice) { - TEST_DESCRIPTION("Create buffer using invalid device handle."); - RETURN_IF_SKIP(Init()); - - VkBufferCreateInfo buffer_ci = vku::InitStructHelper(); - buffer_ci.usage = VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT; - buffer_ci.size = 256; - buffer_ci.sharingMode = VK_SHARING_MODE_EXCLUSIVE; - - VkBuffer buffer; - m_errorMonitor->SetDesiredError("VUID-vkCreateBuffer-device-parameter"); - vk::CreateBuffer((VkDevice)0x123456ab, &buffer_ci, NULL, &buffer); - m_errorMonitor->VerifyFound(); -} - TEST_F(NegativeObjectLifetime, CmdBufferBufferDestroyed) { TEST_DESCRIPTION("Attempt to draw with a command buffer that is invalid due to a buffer dependency being destroyed."); RETURN_IF_SKIP(Init()); diff --git a/tests/unit/pipeline.cpp b/tests/unit/pipeline.cpp index e2d04f16e36..c11df433583 100644 --- a/tests/unit/pipeline.cpp +++ b/tests/unit/pipeline.cpp @@ -447,8 +447,7 @@ TEST_F(NegativePipeline, SamplePNextUnknown) { CreatePipelineHelper::OneshotTest(*this, bad_chain, kErrorBit, "VUID-VkPipelineMultisampleStateCreateInfo-pNext-pNext"); } -// TODO 5600 - Not all pNext structs are being passed in to check extensions -TEST_F(NegativePipeline, DISABLED_SamplePNextDisabled) { +TEST_F(NegativePipeline, SamplePNextDisabled) { TEST_DESCRIPTION("Pass valid pNext VkPipelineMultisampleStateCreateInfo, but without extension enabled"); AddRequiredExtensions(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME); RETURN_IF_SKIP(Init()); diff --git a/tests/unit/pipeline_positive.cpp b/tests/unit/pipeline_positive.cpp index d8027da52f7..cf77562ca01 100644 --- a/tests/unit/pipeline_positive.cpp +++ b/tests/unit/pipeline_positive.cpp @@ -1339,9 +1339,9 @@ TEST_F(PositivePipeline, DualBlendShader) { m_commandBuffer->end(); } -// TODO: CTS was written, but still fails on many older drivers in CI +// CTS was written, but may fail on older drivers // https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/3736 -TEST_F(PositivePipeline, DISABLED_CreationFeedbackCount0) { +TEST_F(PositivePipeline, CreationFeedbackCount0) { TEST_DESCRIPTION("Test graphics pipeline feedback stage count check with 0."); AddRequiredExtensions(VK_EXT_PIPELINE_CREATION_FEEDBACK_EXTENSION_NAME); diff --git a/tests/unit/query.cpp b/tests/unit/query.cpp index 89804464ac9..a095c2563a8 100644 --- a/tests/unit/query.cpp +++ b/tests/unit/query.cpp @@ -2004,121 +2004,6 @@ TEST_F(NegativeQuery, CommandBufferInheritanceFlags) { m_errorMonitor->VerifyFound(); } -// Doesn't seem like these VUs are suppose to be in the spec -// https://gitlab.khronos.org/vulkan/vulkan/-/issues/3733 -TEST_F(NegativeQuery, DISABLED_MultiviewEndQuery) { - TEST_DESCRIPTION("Test CmdEndQuery in subpass with multiview"); - - SetTargetApiVersion(VK_API_VERSION_1_1); - AddRequiredExtensions(VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME); - RETURN_IF_SKIP(InitFramework()); - - const bool indexed_queries = DeviceExtensionSupported(gpu(), nullptr, VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME); - - VkPhysicalDeviceMultiviewFeatures multiview_features = vku::InitStructHelper(); - auto features2 = GetPhysicalDeviceFeatures2(multiview_features); - if (multiview_features.multiview == VK_FALSE) { - GTEST_SKIP() << "multiview feature not supported"; - } - - RETURN_IF_SKIP(InitState(nullptr, &features2)); - - VkAttachmentDescription attach = {}; - attach.format = VK_FORMAT_B8G8R8A8_UNORM; - attach.samples = VK_SAMPLE_COUNT_1_BIT; - attach.loadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; - attach.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; - attach.storeOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - attach.finalLayout = VK_IMAGE_LAYOUT_GENERAL; - - VkAttachmentReference color_att = {}; - color_att.layout = VK_IMAGE_LAYOUT_GENERAL; - - VkSubpassDescription subpasses[2] = {}; - subpasses[0].pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; - subpasses[0].colorAttachmentCount = 1; - subpasses[0].pColorAttachments = &color_att; - subpasses[1].pipelineBindPoint = VK_PIPELINE_BIND_POINT_GRAPHICS; - subpasses[1].colorAttachmentCount = 1; - subpasses[1].pColorAttachments = &color_att; - - uint32_t viewMasks[2] = {0x1u, 0x3u}; - uint32_t correlationMasks[] = {0x1u}; - VkRenderPassMultiviewCreateInfo rpmv_ci = vku::InitStructHelper(); - rpmv_ci.subpassCount = 2; - rpmv_ci.pViewMasks = viewMasks; - rpmv_ci.correlationMaskCount = 1; - rpmv_ci.pCorrelationMasks = correlationMasks; - - VkSubpassDependency dependency = {}; - dependency.srcSubpass = 0; - dependency.dstSubpass = 1; - dependency.srcStageMask = VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT; - dependency.dstStageMask = VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT; - dependency.srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; - dependency.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; - - VkRenderPassCreateInfo rp_ci = vku::InitStructHelper(&rpmv_ci); - rp_ci.attachmentCount = 1; - rp_ci.pAttachments = &attach; - rp_ci.subpassCount = 2; - rp_ci.pSubpasses = subpasses; - rp_ci.dependencyCount = 1; - rp_ci.pDependencies = &dependency; - - vkt::RenderPass render_pass(*m_device, rp_ci); - - VkImageCreateInfo image_ci = vku::InitStructHelper(); - image_ci.imageType = VK_IMAGE_TYPE_2D; - image_ci.format = VK_FORMAT_B8G8R8A8_UNORM; - image_ci.extent.width = 64; - image_ci.extent.height = 64; - image_ci.extent.depth = 1; - image_ci.mipLevels = 1; - image_ci.arrayLayers = 4; - image_ci.samples = VK_SAMPLE_COUNT_1_BIT; - image_ci.tiling = VK_IMAGE_TILING_OPTIMAL; - image_ci.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; - vkt::Image image(*m_device, image_ci, vkt::set_layout); - vkt::ImageView image_view = image.CreateView(VK_IMAGE_VIEW_TYPE_2D_ARRAY, 0, 1, 0, 4); - VkImageView image_view_handle = image_view.handle(); - - vkt::Framebuffer framebuffer(*m_device, render_pass.handle(), 1, &image_view_handle, 64, 64); - - vkt::QueryPool query_pool(*m_device, VK_QUERY_TYPE_OCCLUSION, 2); - - m_commandBuffer->begin(); - m_commandBuffer->BeginRenderPass(render_pass.handle(), framebuffer.handle(), 64, 64); - - vk::CmdBeginQuery(m_commandBuffer->handle(), query_pool.handle(), 1, 0); - - m_commandBuffer->NextSubpass(); - - m_errorMonitor->SetDesiredError("VUID-vkCmdEndQuery-query-00812"); - vk::CmdEndQuery(m_commandBuffer->handle(), query_pool.handle(), 1); - m_errorMonitor->VerifyFound(); - - m_commandBuffer->EndRenderPass(); - vk::CmdEndQuery(m_commandBuffer->handle(), query_pool.handle(), 1); - m_commandBuffer->end(); - - if (indexed_queries) { - m_commandBuffer->reset(); - m_commandBuffer->begin(); - m_commandBuffer->BeginRenderPass(render_pass.handle(), framebuffer.handle(), 64, 64); - vk::CmdBeginQueryIndexedEXT(m_commandBuffer->handle(), query_pool.handle(), 1, 0, 0); - m_commandBuffer->NextSubpass(); - - m_errorMonitor->SetDesiredError("VUID-vkCmdEndQueryIndexedEXT-query-02345"); - vk::CmdEndQueryIndexedEXT(m_commandBuffer->handle(), query_pool.handle(), 1, 0); - m_errorMonitor->VerifyFound(); - - m_commandBuffer->EndRenderPass(); - vk::CmdEndQueryIndexedEXT(m_commandBuffer->handle(), query_pool.handle(), 1, 0); - m_commandBuffer->end(); - } -} - TEST_F(NegativeQuery, MeshShaderQueries) { TEST_DESCRIPTION("Invalid usage without meshShaderQueries enabled"); diff --git a/tests/unit/subgroups.cpp b/tests/unit/subgroups.cpp index 00467b37ea1..3c594fdcaf4 100644 --- a/tests/unit/subgroups.cpp +++ b/tests/unit/subgroups.cpp @@ -268,8 +268,7 @@ TEST_F(NegativeSubgroup, Properties) { } } -// TODO 5600 - Not all pNext structs are being passed in to check version -TEST_F(NegativeSubgroup, DISABLED_pNextDisabled) { +TEST_F(NegativeSubgroup, PNextDisabled) { TEST_DESCRIPTION("Try to use structs with 1.0"); SetTargetApiVersion(VK_API_VERSION_1_0); AddRequiredExtensions(VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME);