fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 11:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

aco: fix regclass checks when fixing to vcc/exec with Builder

Browse source 
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Cc: 20.2 <mesa-stable>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6212>
(cherry picked from commit fc9f502a5b)
This commit is contained in:
Rhys Perry 2020-08-25 21:19:11 +01:00 • committed by Dylan Baker
parent 643ae5ea24
commit a024de19ac
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -733,7 +733,7 @@
"description": "aco: fix regclass checks when fixing to vcc/exec with Builder", "description": "aco: fix regclass checks when fixing to vcc/exec with Builder",
"nominated": true, "nominated": true,
"nomination_type": 0, "nomination_type": 0,
"resolution": 0, "resolution": 1,
"master_sha": null, "master_sha": null,
"because_sha": null "because_sha": null
}, },

9
src/amd/compiler/aco_builder_h.py
View file

@ -317,7 +317,8 @@ public:
% for fixed in ['m0', 'vcc', 'exec', 'scc']: % for fixed in ['m0', 'vcc', 'exec', 'scc']:
Operand ${fixed}(Temp tmp) { Operand ${fixed}(Temp tmp) {
% if fixed == 'vcc' or fixed == 'exec': % if fixed == 'vcc' or fixed == 'exec':
assert(tmp.regClass() == lm); //vcc_hi and exec_hi can still be used in wave32
assert(tmp.type() == RegType::sgpr && tmp.bytes() <= 8);
% endif % endif
Operand op(tmp); Operand op(tmp);
op.setFixed(aco::${fixed}); op.setFixed(aco::${fixed});
@ -326,7 +327,8 @@ public:
Definition ${fixed}(Definition def) { Definition ${fixed}(Definition def) {
% if fixed == 'vcc' or fixed == 'exec': % if fixed == 'vcc' or fixed == 'exec':
assert(def.regClass() == lm); //vcc_hi and exec_hi can still be used in wave32
assert(def.regClass().type() == RegType::sgpr && def.bytes() <= 8);
% endif % endif
def.setFixed(aco::${fixed}); def.setFixed(aco::${fixed});
return def; return def;
@ -334,7 +336,8 @@ public:
Definition hint_${fixed}(Definition def) { Definition hint_${fixed}(Definition def) {
% if fixed == 'vcc' or fixed == 'exec': % if fixed == 'vcc' or fixed == 'exec':
assert(def.regClass() == lm); //vcc_hi and exec_hi can still be used in wave32
assert(def.regClass().type() == RegType::sgpr && def.bytes() <= 8);
% endif % endif
def.setHint(aco::${fixed}); def.setHint(aco::${fixed});
return def; return def;