From baaf7cfb822e8fda8e238e265b84d03c20d03f99 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Thu, 29 Apr 2021 15:12:10 -0700 Subject: [PATCH] intel/compiler: Fix INTEL_DEBUG=hex With the missing else, this prints the compacted hex followed by hex for an uncompacted version of the compacted instruction. It also doesn't print hex for instructions that are not compacted. Fixes: bc4a127d6e1 ("intel/disasm: Label support in shader disassembly for UIP/JIP") Fixes: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4245 Signed-off-by: Jordan Justen Reviewed-by: Sagar Ghuge Reviewed-by: Danylo Piliaiev Part-of: (cherry picked from commit 3f04383521d59ec5716ba4a81db7b97086914573) --- .pick_status.json | 2 +- src/intel/compiler/brw_eu.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index a32e9aa36a8..7343bea4b19 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -139,7 +139,7 @@ "description": "intel/compiler: Fix INTEL_DEBUG=hex", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "bc4a127d6e10318d48fa8b540b9c1ff7d62c8d29" }, diff --git a/src/intel/compiler/brw_eu.cpp b/src/intel/compiler/brw_eu.cpp index 4fe6b8d4fb8..7e6d1ba936b 100644 --- a/src/intel/compiler/brw_eu.cpp +++ b/src/intel/compiler/brw_eu.cpp @@ -566,6 +566,7 @@ brw_disassemble(const struct gen_device_info *devinfo, brw_uncompact_instruction(devinfo, &uncompacted, compacted); insn = &uncompacted; + } else { if (dump_hex) { unsigned char * insn_ptr = ((unsigned char *)&insn[0]); for (int i = 0 ; i < 16; i = i + 4) {