From 14f4906e535a2f0367e4769bebb38f633d42ea75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Wed, 12 Jun 2024 09:05:38 +0200 Subject: [PATCH] aco/assembler: fix MTBUF opcode encoding on GFX11 We have accidentally set the tfe bit for some opcodes. Cc: mesa-stable Part-of: --- src/amd/ci/radv-navi31-aco-fails.txt | 5 ----- src/amd/compiler/aco_assembler.cpp | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/amd/ci/radv-navi31-aco-fails.txt b/src/amd/ci/radv-navi31-aco-fails.txt index e07550946f6..087c51cee5a 100644 --- a/src/amd/ci/radv-navi31-aco-fails.txt +++ b/src/amd/ci/radv-navi31-aco-fails.txt @@ -3,8 +3,3 @@ dEQP-VK.api.version_check.unavailable_entry_points,Fail # New CTS failures in 1.3.8.0 dEQP-VK.api.get_device_proc_addr.non_enabled,Fail - -# Regression in !29235 -# https://gitlab.freedesktop.org/mesa/mesa/-/issues/11292 -dEQP-VK.pipeline.monolithic.vertex_input.max_attributes.32_attributes.binding_one_to_one.interleaved,Fail -dEQP-VK.pipeline.pipeline_library.vertex_input.max_attributes.32_attributes.binding_one_to_one.interleaved,Fail diff --git a/src/amd/compiler/aco_assembler.cpp b/src/amd/compiler/aco_assembler.cpp index 8ac816f6565..a5d91ce8b84 100644 --- a/src/amd/compiler/aco_assembler.cpp +++ b/src/amd/compiler/aco_assembler.cpp @@ -674,7 +674,7 @@ emit_mtbuf_instruction(asm_context& ctx, std::vector& out, Instruction encoding |= reg(ctx, instr->definitions[0], 8) << 8; encoding |= reg(ctx, instr->operands[1], 8); - if (ctx.gfx_level >= GFX10) { + if (ctx.gfx_level >= GFX10 && ctx.gfx_level < GFX11) { encoding |= (((opcode & 0x08) >> 3) << 21); /* MSB of 4-bit OPCODE */ }