From de790c3c5fa3e9c4658241de4d8183c2c1a77fb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Mon, 20 Jan 2025 00:42:26 -0500 Subject: [PATCH] Revert "ac/llvm: enable wqm for ac_build_quad_swizzle from ac_build_fs_interp_mov" This reverts commit 9d4d9e61504c7e3ac760a88f543cf940d52a20fe. It breaks on Navi31: * KHR-GL46.shaders.uniform_block.instance_array_basic_type.shared.bvec3,Fail * KHR-GL46.shaders.uniform_block.instance_array_basic_type.std140.bvec3,Fail * KHR-GL46.shaders.uniform_block.random.all_per_block_buffers.13,Fail * KHR-GL46.shaders.uniform_block.random.all_per_block_buffers.3,Fail * KHR-GL46.shaders.uniform_block.single_basic_array.shared.bvec3,Fail * KHR-GL46.shaders.uniform_block.single_basic_array.std140.bvec3,Fail * KHR-GLES3.shaders.uniform_block.instance_array_basic_type.shared.bvec3,Fail * KHR-GLES3.shaders.uniform_block.instance_array_basic_type.std140.bvec3,Fail * KHR-GLES3.shaders.uniform_block.random.all_per_block_buffers.13,Fail * KHR-GLES3.shaders.uniform_block.random.all_per_block_buffers.3,Fail * KHR-GLES3.shaders.uniform_block.single_basic_array.shared.bvec3,Fail * KHR-GLES3.shaders.uniform_block.single_basic_array.std140.bvec3,Fail * dEQP-GLES3.functional.ubo.instance_array_basic_type.shared.bvec3_both,Fail * dEQP-GLES3.functional.ubo.instance_array_basic_type.std140.bvec3_both,Fail * dEQP-GLES3.functional.ubo.random.vector_types.24,Fail * dEQP-GLES3.functional.ubo.single_basic_array.shared.bvec3_both,Fail * dEQP-GLES3.functional.ubo.single_basic_array.std140.bvec3_both,Fail Fixes: 9d4d9e61504c7e3ac76 Reviewed-by: Pierre-Eric Pelloux-Prayer Part-of: --- src/amd/llvm/ac_llvm_build.c | 2 +- src/gallium/drivers/radeonsi/ci/gfx11-navi31-fail.csv | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/amd/llvm/ac_llvm_build.c b/src/amd/llvm/ac_llvm_build.c index 0fd1381c72f..514dc885833 100644 --- a/src/amd/llvm/ac_llvm_build.c +++ b/src/amd/llvm/ac_llvm_build.c @@ -758,7 +758,7 @@ LLVMValueRef ac_build_fs_interp_mov(struct ac_llvm_context *ctx, unsigned parame p = ac_build_intrinsic(ctx, "llvm.amdgcn.lds.param.load", ctx->f32, args, 3, 0); p = ac_build_intrinsic(ctx, "llvm.amdgcn.wqm.f32", ctx->f32, &p, 1, 0); - p = ac_build_quad_swizzle(ctx, p, parameter, parameter, parameter, parameter, true); + p = ac_build_quad_swizzle(ctx, p, parameter, parameter, parameter, parameter, false); return ac_build_intrinsic(ctx, "llvm.amdgcn.wqm.f32", ctx->f32, &p, 1, 0); } else { args[0] = LLVMConstInt(ctx->i32, (parameter + 2) % 3, 0); diff --git a/src/gallium/drivers/radeonsi/ci/gfx11-navi31-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx11-navi31-fail.csv index 20188cd2528..424cd4e8aa3 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx11-navi31-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx11-navi31-fail.csv @@ -31,6 +31,7 @@ spec@khr_texture_compression_astc@sliced-3d-miptree-gles srgb-fp@sRGB decode ful # glcts failures GTF-GL46.gtf30.GL3Tests.fragment_coord_conventions.fragment_coord_conventions_multisample,Fail GTF-GL46.gtf32.GL3Tests.fragment_coord_conventions.fragment_coord_conventions_32_multisample,Fail +KHR-GL46.shaders.uniform_block.random.nested_structs_instance_arrays.0,Fail ## Fail because GFX10+ removed MS texture support (see si_get_sparse_texture_virtual_page_size) KHR-GL46.sparse_texture2_tests.SparseTexture2Allocation_texture_2d_multisample_array_r11f_g11f_b10f,Fail KHR-GL46.sparse_texture2_tests.SparseTexture2Allocation_texture_2d_multisample_array_r16,Fail @@ -688,5 +689,11 @@ KHR-GL46.transform_feedback_overflow_query_ARB.advanced-single-stream-separate-a KHR-GL46.transform_feedback_overflow_query_ARB.multiple-streams-multiple-buffers-per-stream,Fail KHR-GL46.transform_feedback_overflow_query_ARB.multiple-streams-one-buffer-per-stream,Fail -# escts failures (incorrect glMemoryBarrier usage in the test) +# escts failures (pass with ACO) +KHR-GLES3.shaders.uniform_block.random.nested_structs_instance_arrays.0,Fail KHR-GLES31.core.shader_image_load_store.basic-allFormats-store-fs,Fail + +# deqp failures (pass with ACO) +dEQP-GLES3.functional.ubo.random.all_per_block_buffers.29,Fail +dEQP-GLES3.functional.ubo.random.basic_instance_arrays.22,Fail +dEQP-GLES3.functional.ubo.random.nested_structs.4,Fail