Module: Mesa Branch: staging/20.0 Commit: 5620cd4bcaf5d8f0a90d9e087b35e0632ec44c1c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5620cd4bcaf5d8f0a90d9e087b35e0632ec44c1c
Author: Rhys Perry <[email protected]> Date: Fri Feb 21 12:00:38 2020 +0000 aco: fix carry-out size for wave32 v_add_co_u32_e64 Signed-off-by: Rhys Perry <[email protected]> Reviewed-By: Timur Kristóf <[email protected]> Fixes: e0bcefc3a0a ('aco/wave32: Use lane mask regclass for exec/vcc.') Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3902> (cherry picked from commit 215df21dea14358cccc1c9d84a186221cf834c7d) --- .pick_status.json | 2 +- src/amd/compiler/aco_builder_h.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index d89f3db33a7..733cf38e272 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -175,7 +175,7 @@ "description": "aco: fix carry-out size for wave32 v_add_co_u32_e64", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "e0bcefc3a0a15a8c7ec00cfa53fd8fffcc07342a" }, diff --git a/src/amd/compiler/aco_builder_h.py b/src/amd/compiler/aco_builder_h.py index 97c03ac8adf..65eee5ebd1d 100644 --- a/src/amd/compiler/aco_builder_h.py +++ b/src/amd/compiler/aco_builder_h.py @@ -392,7 +392,7 @@ public: if (!carry_in.op.isUndefined()) return vop2(aco_opcode::v_addc_co_u32, Definition(dst), hint_vcc(def(lm)), a, b, carry_in); else if (program->chip_class >= GFX10 && carry_out) - return vop3(aco_opcode::v_add_co_u32_e64, Definition(dst), def(s2), a, b); + return vop3(aco_opcode::v_add_co_u32_e64, Definition(dst), def(lm), a, b); else if (program->chip_class < GFX9 || carry_out) return vop2(aco_opcode::v_add_co_u32, Definition(dst), hint_vcc(def(lm)), a, b); else _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
