From fdb48555daae62967035fbd85fd52d444ea69470 Mon Sep 17 00:00:00 2001 From: Konstantin Seurer Date: Sun, 28 Jul 2024 22:02:00 +0200 Subject: [PATCH] aco: print s_delay_alu INSTSKIP>3 correctly INSTSKIP has 3 bits. Fixes: 94958e6 ("aco: improve printing of s_delay_alu") Reviewed-by: Rhys Perry Part-of: (cherry picked from commit f8bf9f07b6e60240ed4789fbde1599a331d58ec1) --- .pick_status.json | 2 +- src/amd/compiler/aco_print_ir.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 0a1cf77ad6d..e39d3420b12 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -7234,7 +7234,7 @@ "description": "aco: print s_delay_alu INSTSKIP>3 correctly", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "94958e637d11d9dbe9345da1a8ff4048ef441389", "notes": null diff --git a/src/amd/compiler/aco_print_ir.cpp b/src/amd/compiler/aco_print_ir.cpp index 66bb079b2cf..bb20d844c43 100644 --- a/src/amd/compiler/aco_print_ir.cpp +++ b/src/amd/compiler/aco_print_ir.cpp @@ -310,7 +310,7 @@ print_instr_format_specific(enum amd_gfx_level gfx_level, const Instruction* ins } case aco_opcode::s_delay_alu: { unsigned delay[2] = {imm & 0xfu, (imm >> 7) & 0xfu}; - unsigned skip = (imm >> 4) & 0x3; + unsigned skip = (imm >> 4) & 0x7; for (unsigned i = 0; i < 2; i++) { if (i == 1 && skip) { if (skip == 1)