bp: Fix BP tests to work with validation

Author: spencer-lunarg

layers/best_practices/bp_pipeline.cpp

@@ -146,27 +146,6 @@ bool BestPractices::ValidateCreateGraphicsPipeline(const VkGraphicsPipelineCreat
         }
     }
 
-    for (const auto& stage : pipeline.stage_states) {
-        if (stage.GetStage() != VK_SHADER_STAGE_FRAGMENT_BIT) {
-            continue;
-        }
-        const auto& rp_state = pipeline.RenderPassState();
-        if (rp_state && !rp_state->UsesDynamicRendering() && stage.entrypoint) {
-            auto rpci = rp_state->create_info.ptr();
-            auto subpass = pipeline.Subpass();
-            for (const auto& variable : stage.entrypoint->resource_interface_variables) {
-                if (!variable.decorations.Has(spirv::DecorationSet::input_attachment_bit)) {
-                    continue;
-                }
-                auto slot = variable.decorations.input_attachment_index_start;
-                if (!rpci->pSubpasses[subpass].pInputAttachments || slot >= rpci->pSubpasses[subpass].inputAttachmentCount) {
-                    const LogObjectList objlist(stage.module_state->Handle(), pipeline.PipelineLayoutState()->Handle());
-                    skip |= LogWarning("BestPractices-Shader-MissingInputAttachment", device, create_info_loc,
-                                       "Shader consumes input attachment index %" PRIu32 " but not provided in subpass", slot);
-                }
-            }
-        }
-    }
     return skip;
 }
 

layers/best_practices/bp_render_pass.cpp

@@ -169,12 +169,6 @@ bool BestPractices::ValidateCmdBeginRenderPass(VkCommandBuffer commandBuffer, co
 
     if (!pRenderPassBegin) return skip;
 
-    if (pRenderPassBegin->renderArea.extent.width == 0 || pRenderPassBegin->renderArea.extent.height == 0) {
-        skip |= LogWarning("BestPractices-Arm-vkCmdBeginRenderPass-zero-size-render-area", commandBuffer, loc,
-                           "This render pass has a zero-size render area. It cannot write to any attachments, "
-                           "and can only be used for side effects such as layout transitions.");
-    }
-
     auto rp_state = Get<vvl::RenderPass>(pRenderPassBegin->renderPass);
     ASSERT_AND_RETURN_SKIP(rp_state);
 

tests/framework/layer_validation_tests.h

@@ -242,10 +242,7 @@ class VkBestPracticesLayerTest : public VkLayerTest {
 
   protected:
     VkValidationFeatureEnableEXT enables_[1] = {VK_VALIDATION_FEATURE_ENABLE_BEST_PRACTICES_EXT};
-    VkValidationFeatureDisableEXT disables_[4] = {
-        VK_VALIDATION_FEATURE_DISABLE_THREAD_SAFETY_EXT, VK_VALIDATION_FEATURE_DISABLE_API_PARAMETERS_EXT,
-        VK_VALIDATION_FEATURE_DISABLE_OBJECT_LIFETIMES_EXT, VK_VALIDATION_FEATURE_DISABLE_CORE_CHECKS_EXT};
-    VkValidationFeaturesEXT features_ = {VK_STRUCTURE_TYPE_VALIDATION_FEATURES_EXT, nullptr, 1, enables_, 4, disables_};
+    VkValidationFeaturesEXT features_ = {VK_STRUCTURE_TYPE_VALIDATION_FEATURES_EXT, nullptr, 1, enables_, 0, nullptr};
 };
 
 class VkAmdBestPracticesLayerTest : public VkBestPracticesLayerTest {};

tests/unit/amd_best_practices.cpp

@@ -82,6 +82,7 @@ TEST_F(VkAmdBestPracticesLayerTest, UseMutableRT) {
     vk::CreateImage(m_device->handle(), &img_info, nullptr, &test_image);
     m_errorMonitor->VerifyFound();
 
+    m_errorMonitor->SetAllowedFailureMsg("VUID-VkImageCreateInfo-imageCreateMaxMipLevels-02251");
     m_errorMonitor->SetDesiredFailureMsg(kPerformanceWarningBit, "BestPractices-AMD-vkImage-DontUseMutableRenderTargets");
     // create a depth attachment image with mutable bit set
     img_info = {VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
@@ -162,6 +163,7 @@ TEST_F(VkAmdBestPracticesLayerTest, UsageConcurentRT) {
     vk::CreateImage(m_device->handle(), &img_info, nullptr, &test_image);
     m_errorMonitor->VerifyFound();
 
+    m_errorMonitor->SetAllowedFailureMsg("VUID-VkImageCreateInfo-imageCreateMaxMipLevels-02251");
     m_errorMonitor->SetDesiredFailureMsg(kPerformanceWarningBit, "BestPractices-AMD-vkImage-AvoidConcurrentRenderTargets");
     // create a render target image with mutable bit set
     img_info = {VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO,
@@ -416,6 +418,7 @@ TEST_F(VkAmdBestPracticesLayerTest, ClearImage) {
                                       0,
                                       nullptr,
                                       VK_IMAGE_LAYOUT_UNDEFINED};
+        m_errorMonitor->SetAllowedFailureMsg("VUID-VkImageCreateInfo-imageCreateMaxMipLevels-02251");
         vkt::Image image_1D(*m_device, img_info, vkt::set_layout);
 
         m_commandBuffer->begin();
@@ -462,7 +465,6 @@ TEST_F(VkAmdBestPracticesLayerTest, ImageToImageCopy) {
 
     img_info.tiling = VK_IMAGE_TILING_LINEAR;
     img_info.usage = VK_IMAGE_USAGE_TRANSFER_DST_BIT;
-    img_info.initialLayout = VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL;
     vkt::Image image_1D_2(*m_device, img_info, vkt::set_layout);
     if (!image_1D_2.initialized()) {
         GTEST_SKIP() << "Could not initilize Linear image, skipping image to image copy test";
@@ -636,6 +638,7 @@ TEST_F(VkAmdBestPracticesLayerTest, NumberOfSubmissions) {
 
     m_errorMonitor->SetDesiredFailureMsg(kPerformanceWarningBit, "BestPractices-Submission-ReduceNumberOfSubmissions");
     m_errorMonitor->SetUnexpectedError("VUID-VkPresentInfoKHR-pImageIndices-01430");
+    m_errorMonitor->SetUnexpectedError("UNASSIGNED-VkPresentInfoKHR-pImageIndices-MissingAcquireWait");
 
     vk::QueuePresentKHR(m_default_queue->handle(), &present_info);
 

tests/unit/arm_best_practices.cpp

@@ -103,6 +103,7 @@ TEST_F(VkArmBestPracticesLayerTest, TooManySamples) {
     RETURN_IF_SKIP(InitState());
 
     m_errorMonitor->SetDesiredFailureMsg(kPerformanceWarningBit, "BestPractices-Arm-vkCreateImage-too-large-sample-count");
+    m_errorMonitor->SetAllowedFailureMsg("VUID-VkImageCreateInfo-samples-02258");
 
     VkImageCreateInfo image_info{};
     image_info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO;
@@ -245,7 +246,7 @@ TEST_F(VkArmBestPracticesLayerTest, AttachmentNeedsReadback) {
     auto image_view = image.CreateView();
 
     RenderPassSingleSubpass rp(*this);
-    rp.AddAttachmentDescription(VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_UNDEFINED,
+    rp.AddAttachmentDescription(VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_LAYOUT_GENERAL, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
                                 VK_ATTACHMENT_LOAD_OP_LOAD, VK_ATTACHMENT_STORE_OP_STORE);
     rp.AddAttachmentReference({0, VK_IMAGE_LAYOUT_GENERAL});
     rp.AddColorAttachment(0);
@@ -781,7 +782,7 @@ TEST_F(VkArmBestPracticesLayerTest, ComputeShaderBadWorkGroupThreadAlignmentTest
         m_errorMonitor->VerifyFound();
     }
 
-    {
+    if (m_device->phy().limits_.maxComputeWorkGroupInvocations > 128) {
         char const* csSource = R"glsl(
             #version 450
             layout(local_size_x = 16, local_size_y = 9, local_size_z = 1) in;
@@ -960,6 +961,7 @@ TEST_F(VkArmBestPracticesLayerTest, RedundantRenderPassStore) {
     render_pass_begin_info.framebuffer = framebuffers[0];
     render_pass_begin_info.clearValueCount = 3;
     render_pass_begin_info.pClearValues = clear_values;
+    render_pass_begin_info.renderArea.extent = {32, 32};
 
     const auto execute_work = [&](const std::function<void(vkt::CommandBuffer & command_buffer)>& work) {
         vk::ResetCommandPool(device(), m_command_pool.handle(), 0);
@@ -987,6 +989,7 @@ TEST_F(VkArmBestPracticesLayerTest, RedundantRenderPassStore) {
         rpbi.framebuffer = framebuffers[1];
         rpbi.clearValueCount = 3;
         rpbi.pClearValues = clear_values;
+        rpbi.renderArea.extent = {32, 32};
 
         command_buffer.BeginRenderPass(rpbi);