diff --git a/src/amd/ci/radv-navi10-aco-fails.txt b/src/amd/ci/radv-navi10-aco-fails.txt index acda34d6cf2..964b7b6979f 100644 --- a/src/amd/ci/radv-navi10-aco-fails.txt +++ b/src/amd/ci/radv-navi10-aco-fails.txt @@ -1,2 +1,12 @@ # New CTS failures in 1.3.7.0 dEQP-VK.api.version_check.unavailable_entry_points,Fail + +# Test bugs https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/5074 +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_geom,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_tess,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_tess_include_geom,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_geom,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_tess,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_tess_include_geom,Crash diff --git a/src/amd/ci/radv-navi21-aco-fails.txt b/src/amd/ci/radv-navi21-aco-fails.txt index acda34d6cf2..964b7b6979f 100644 --- a/src/amd/ci/radv-navi21-aco-fails.txt +++ b/src/amd/ci/radv-navi21-aco-fails.txt @@ -1,2 +1,12 @@ # New CTS failures in 1.3.7.0 dEQP-VK.api.version_check.unavailable_entry_points,Fail + +# Test bugs https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/5074 +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_geom,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_tess,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_tess_include_geom,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_geom,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_tess,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_tess_include_geom,Crash diff --git a/src/amd/ci/radv-navi31-aco-fails.txt b/src/amd/ci/radv-navi31-aco-fails.txt index f5a3e5b2660..aa25bb0bfeb 100644 --- a/src/amd/ci/radv-navi31-aco-fails.txt +++ b/src/amd/ci/radv-navi31-aco-fails.txt @@ -102,3 +102,13 @@ dEQP-VK.compute.shader_object_spirv.cooperative_matrix.khr_r.matrixmuladd_min.ui dEQP-VK.compute.shader_object_spirv.cooperative_matrix.khr_r.matrixmuladd_min.uint8_uint32.workgroup.rowmajor,Fail dEQP-VK.compute.shader_object_spirv.cooperative_matrix.khr_r.matrixmuladd_min.uint8_uint32.workgroup_varptr.colmajor,Fail dEQP-VK.compute.shader_object_spirv.cooperative_matrix.khr_r.matrixmuladd_min.uint8_uint32.workgroup_varptr.rowmajor,Fail + +# Test bugs https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/5074 +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_geom,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_tess,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_tess_include_geom,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_geom,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_tess,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_tess_include_geom,Crash diff --git a/src/amd/ci/radv-polaris10-aco-fails.txt b/src/amd/ci/radv-polaris10-aco-fails.txt index a91278246ec..a6a93b564bc 100644 --- a/src/amd/ci/radv-polaris10-aco-fails.txt +++ b/src/amd/ci/radv-polaris10-aco-fails.txt @@ -1,2 +1,12 @@ # New CTS failures in 1.3.7.0. dEQP-VK.api.version_check.unavailable_entry_points,Fail + +# Test bugs https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/5074 +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_geom,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_tess,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_tess_include_geom,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_geom,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_tess,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_tess_include_geom,Crash diff --git a/src/amd/ci/radv-raven-fails.txt b/src/amd/ci/radv-raven-fails.txt index e69de29bb2d..adec864ddbf 100644 --- a/src/amd/ci/radv-raven-fails.txt +++ b/src/amd/ci/radv-raven-fails.txt @@ -0,0 +1,9 @@ +# Test bugs https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/5074 +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_geom,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_tess,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_tess_include_geom,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_geom,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_tess,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_tess_include_geom,Crash diff --git a/src/amd/ci/radv-renoir-aco-fails.txt b/src/amd/ci/radv-renoir-aco-fails.txt index a91278246ec..a6a93b564bc 100644 --- a/src/amd/ci/radv-renoir-aco-fails.txt +++ b/src/amd/ci/radv-renoir-aco-fails.txt @@ -1,2 +1,12 @@ # New CTS failures in 1.3.7.0. dEQP-VK.api.version_check.unavailable_entry_points,Fail + +# Test bugs https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/5074 +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_geom,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_tess,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_tess_include_geom,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_geom,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_tess,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_tess_include_geom,Crash diff --git a/src/amd/ci/radv-stoney-aco-fails.txt b/src/amd/ci/radv-stoney-aco-fails.txt index e0958d1008d..d52f5efff4f 100644 --- a/src/amd/ci/radv-stoney-aco-fails.txt +++ b/src/amd/ci/radv-stoney-aco-fails.txt @@ -40,3 +40,13 @@ dEQP-VK.binding_model.descriptor_buffer.multiple.graphics_rgen_buffers1_sets3,Cr dEQP-VK.binding_model.descriptor_buffer.multiple.graphics_rgen_buffers1_sets3_imm_samplers,Crash dEQP-VK.binding_model.descriptor_buffer.multiple.graphics_sect_buffers8_sets1,Crash dEQP-VK.binding_model.descriptor_buffer.multiple.graphics_tesc_buffers1_sets3,Crash + +# Test bugs https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/5074 +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_geom,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_tess,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_tess_include_geom,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_geom,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_tess,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_tess_include_geom,Crash diff --git a/src/amd/ci/radv-tahiti-aco-fails.txt b/src/amd/ci/radv-tahiti-aco-fails.txt index 387c1c22f24..09cebd14290 100644 --- a/src/amd/ci/radv-tahiti-aco-fails.txt +++ b/src/amd/ci/radv-tahiti-aco-fails.txt @@ -19,3 +19,13 @@ dEQP-VK.pipeline.pipeline_library.input_attribute_offset.vec4.offset_4.packed.no dEQP-VK.pipeline.pipeline_library.input_attribute_offset.vec4.offset_4.packed.with_memory_offset.static,Fail dEQP-VK.spirv_assembly.type.vec4.i8.mod_geom,Crash dEQP-VK.spirv_assembly.type.vec4.i8.rem_geom,Fail + +# Test bugs https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/5074 +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_geom,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_tess,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_tess_include_geom,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_geom,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_tess,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_tess_include_geom,Crash diff --git a/src/amd/ci/radv-vangogh-aco-fails.txt b/src/amd/ci/radv-vangogh-aco-fails.txt index 200abf381a7..bc975be71ce 100644 --- a/src/amd/ci/radv-vangogh-aco-fails.txt +++ b/src/amd/ci/radv-vangogh-aco-fails.txt @@ -68,3 +68,13 @@ dEQP-VK.api.copy_and_blit.dedicated_allocation.image_to_buffer.2d_images.mip_cop # New CTS failures in 1.3.7.0. dEQP-VK.api.version_check.unavailable_entry_points,Fail + +# Test bugs https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/5074 +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_geom,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_tess,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_tess_include_geom,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_geom,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_tess,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_tess_include_geom,Crash diff --git a/src/amd/ci/radv-vega10-aco-fails.txt b/src/amd/ci/radv-vega10-aco-fails.txt index a91278246ec..a6a93b564bc 100644 --- a/src/amd/ci/radv-vega10-aco-fails.txt +++ b/src/amd/ci/radv-vega10-aco-fails.txt @@ -1,2 +1,12 @@ # New CTS failures in 1.3.7.0. dEQP-VK.api.version_check.unavailable_entry_points,Fail + +# Test bugs https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/5074 +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_geom,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_tess,Crash +dEQP-VK.pipeline.fast_linked_library.misc.unused_shader_stages_include_tess_include_geom,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_geom,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_tess,Crash +dEQP-VK.pipeline.pipeline_library.misc.unused_shader_stages_include_tess_include_geom,Crash diff --git a/src/amd/vulkan/radv_pipeline_graphics.c b/src/amd/vulkan/radv_pipeline_graphics.c index 17ab3cee0f6..ac235dc5752 100644 --- a/src/amd/vulkan/radv_pipeline_graphics.c +++ b/src/amd/vulkan/radv_pipeline_graphics.c @@ -674,10 +674,6 @@ radv_pipeline_import_graphics_info(struct radv_device *device, struct radv_graph for (uint32_t i = 0; i < pCreateInfo->stageCount; i++) { const VkPipelineShaderStageCreateInfo *sinfo = &pCreateInfo->pStages[i]; - /* Ignore shader stages that don't need to be imported. */ - if (!(shader_stage_to_pipeline_library_flags(sinfo->stage) & lib_flags)) - continue; - pipeline->active_stages |= sinfo->stage; } @@ -2346,10 +2342,6 @@ radv_pipeline_import_retained_shaders(const struct radv_device *device, struct r const VkPipelineShaderStageCreateInfo *sinfo = &lib->stages[i]; gl_shader_stage s = vk_to_mesa_shader_stage(sinfo->stage); - /* Ignore graphics shader stages that don't need to be imported. */ - if (!(shader_stage_to_pipeline_library_flags(sinfo->stage) & lib->lib_flags)) - continue; - radv_pipeline_stage_init(sinfo, &lib->layout, &lib->stage_keys[s], &stages[s]); } @@ -2662,7 +2654,7 @@ static VkResult radv_graphics_pipeline_compile(struct radv_graphics_pipeline *pipeline, const VkGraphicsPipelineCreateInfo *pCreateInfo, struct radv_pipeline_layout *pipeline_layout, struct radv_device *device, struct vk_pipeline_cache *cache, const struct radv_graphics_pipeline_key *pipeline_key, - VkGraphicsPipelineLibraryFlagBitsEXT lib_flags, bool fast_linking_enabled) + bool fast_linking_enabled) { struct radv_shader_binary *binaries[MESA_VULKAN_SHADER_STAGES] = {NULL}; struct radv_shader_binary *gs_copy_binary = NULL; @@ -2694,10 +2686,6 @@ radv_graphics_pipeline_compile(struct radv_graphics_pipeline *pipeline, const Vk const VkPipelineShaderStageCreateInfo *sinfo = &pCreateInfo->pStages[i]; gl_shader_stage stage = vk_to_mesa_shader_stage(sinfo->stage); - /* Ignore graphics shader stages that don't need to be imported. */ - if (!(shader_stage_to_pipeline_library_flags(sinfo->stage) & lib_flags)) - continue; - radv_pipeline_stage_init(sinfo, pipeline_layout, &pipeline_key->stage_info[stage], &stages[stage]); } @@ -4109,7 +4097,7 @@ radv_graphics_pipeline_init(struct radv_graphics_pipeline *pipeline, struct radv radv_generate_graphics_pipeline_key(device, pCreateInfo, &state, pipeline->base.type, needed_lib_flags); result = radv_graphics_pipeline_compile(pipeline, pCreateInfo, &pipeline_layout, device, cache, &key, - needed_lib_flags, fast_linking_enabled); + fast_linking_enabled); if (result != VK_SUCCESS) { radv_pipeline_layout_finish(device, &pipeline_layout); return result; @@ -4270,7 +4258,7 @@ radv_graphics_lib_pipeline_init(struct radv_graphics_lib_pipeline *pipeline, str radv_generate_graphics_pipeline_key(device, pCreateInfo, state, pipeline->base.base.type, needed_lib_flags); return radv_graphics_pipeline_compile(&pipeline->base, pCreateInfo, pipeline_layout, device, cache, &key, - needed_lib_flags, fast_linking_enabled); + fast_linking_enabled); } static VkResult