From 49bdc3a1c2cb9958188f1e85943f8bb91dae32f8 Mon Sep 17 00:00:00 2001 From: Georg Lehmann Date: Mon, 13 Mar 2023 19:23:25 +0100 Subject: [PATCH] aco/opcodes: move v_cndmask_b32 back to the VOP2 list MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Daniel Schürmann Part-of: --- src/amd/compiler/aco_opcodes.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/amd/compiler/aco_opcodes.py b/src/amd/compiler/aco_opcodes.py index 5b9c535..02667d4 100644 --- a/src/amd/compiler/aco_opcodes.py +++ b/src/amd/compiler/aco_opcodes.py @@ -716,6 +716,7 @@ for (gfx6, gfx7, gfx8, gfx9, gfx10, gfx11, name) in SMEM: # TODO: misses some GFX6_7 opcodes which were shifted to VOP3 in GFX8 VOP2 = { # GFX6, GFX7, GFX8, GFX9, GFX10,GFX11,name, input modifiers, output modifiers + (0x00, 0x00, 0x00, 0x00, 0x01, 0x01, "v_cndmask_b32", True, False), (0x01, 0x01, -1, -1, -1, -1, "v_readlane_b32", False, False), (0x02, 0x02, -1, -1, -1, -1, "v_writelane_b32", False, False), (0x03, 0x03, 0x01, 0x01, 0x03, 0x03, "v_add_f32", True, True), @@ -795,11 +796,6 @@ VOP2 = { for (gfx6, gfx7, gfx8, gfx9, gfx10, gfx11, name, in_mod, out_mod) in VOP2: opcode(name, gfx7, gfx9, gfx10, gfx11, Format.VOP2, InstrClass.Valu32, in_mod, out_mod) -if True: - # v_cndmask_b32 can use input modifiers but not output modifiers - (gfx6, gfx7, gfx8, gfx9, gfx10, gfx11, name) = (0x00, 0x00, 0x00, 0x00, 0x01, 0x01, "v_cndmask_b32") - opcode(name, gfx7, gfx9, gfx10, gfx11, Format.VOP2, InstrClass.Valu32, True, False) - # VOP1 instructions: instructions with 1 input and 1 output VOP1 = { -- 2.7.4