From 909b675c1934ffda8693ea0f04f8947d9dff1102 Mon Sep 17 00:00:00 2001 From: Icecream95 Date: Mon, 21 Feb 2022 16:50:56 +1300 Subject: [PATCH] pan/bi: Skip psuedo sources in ISA.xml The second staging register source for the +BLEND instruction should not be packed nor disassembled, so skip it when include_pseudo is not set. Fixes: 795638767d1 ("pan/bi: Use fused dual source blending") Part-of: (cherry picked from commit 66a604efb5237d62020d278c596fc13643cdfe8f) --- .pick_status.json | 2 +- src/panfrost/bifrost/bifrost_isa.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index acd9eb57408..317e0fa8ef2 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -571,7 +571,7 @@ "description": "pan/bi: Skip psuedo sources in ISA.xml", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "795638767d142a58b76c91a0719e42536435320f" }, diff --git a/src/panfrost/bifrost/bifrost_isa.py b/src/panfrost/bifrost/bifrost_isa.py index 63dd785d513..89e5d6f008f 100644 --- a/src/panfrost/bifrost/bifrost_isa.py +++ b/src/panfrost/bifrost/bifrost_isa.py @@ -143,6 +143,9 @@ def parse_instruction(ins, include_pseudo): common['exact'] = parse_exact(ins) for src in ins.findall('src'): + if src.attrib.get('pseudo', False) and not include_pseudo: + continue + mask = int(src.attrib['mask'], 0) if ('mask' in src.attrib) else 0xFF common['srcs'].append([int(src.attrib['start'], 0), mask])