diff options
| author | Rhys Perry <pendingchaos02@gmail.com> | 2021-01-20 13:50:45 +0000 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-01-22 14:12:32 +0000 |
| commit | 441ead5fb35f84dcbaf4724a771ff3475257d400 (patch) | |
| tree | 132a6d88d589d5c2caa320d4e7d3445a9f5f1443 /src/amd/compiler/aco_builder_h.py | |
| parent | 925d701014c2ba084061eae131f4b5c75e595f29 (diff) | |
| download | mesa-441ead5fb35f84dcbaf4724a771ff3475257d400.tar.gz | |
aco: remove Format::{VOP3A,VOP3B}
These are really the same as Format::VOP3.
Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8595>
Diffstat (limited to 'src/amd/compiler/aco_builder_h.py')
| -rw-r--r-- | src/amd/compiler/aco_builder_h.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/amd/compiler/aco_builder_h.py b/src/amd/compiler/aco_builder_h.py index af0eacdb7ac..502ffc7cd34 100644 --- a/src/amd/compiler/aco_builder_h.py +++ b/src/amd/compiler/aco_builder_h.py @@ -484,7 +484,7 @@ public: int num_defs = carry_out ? 2 : 1; aco_ptr<Instruction> sub; if (vop3) - sub.reset(create_instruction<VOP3A_instruction>(op, Format::VOP3B, num_ops, num_defs)); + sub.reset(create_instruction<VOP3_instruction>(op, Format::VOP3, num_ops, num_defs)); else sub.reset(create_instruction<VOP2_instruction>(op, Format::VOP2, num_ops, num_defs)); sub->operands[0] = a.op; @@ -534,15 +534,15 @@ formats = [("pseudo", [Format.PSEUDO], 'Pseudo_instruction', list(itertools.prod ("vop2", [Format.VOP2], 'VOP2_instruction', itertools.product([1, 2], [2, 3])), ("vop2_sdwa", [Format.VOP2, Format.SDWA], 'SDWA_instruction', itertools.product([1, 2], [2, 3])), ("vopc", [Format.VOPC], 'VOPC_instruction', itertools.product([1, 2], [2])), - ("vop3", [Format.VOP3A], 'VOP3A_instruction', [(1, 3), (1, 2), (1, 1), (2, 2)]), + ("vop3", [Format.VOP3], 'VOP3_instruction', [(1, 3), (1, 2), (1, 1), (2, 2)]), ("vop3p", [Format.VOP3P], 'VOP3P_instruction', [(1, 2), (1, 3)]), ("vintrp", [Format.VINTRP], 'Interp_instruction', [(1, 2), (1, 3)]), ("vop1_dpp", [Format.VOP1, Format.DPP], 'DPP_instruction', [(1, 1)]), ("vop2_dpp", [Format.VOP2, Format.DPP], 'DPP_instruction', itertools.product([1, 2], [2, 3])), ("vopc_dpp", [Format.VOPC, Format.DPP], 'DPP_instruction', itertools.product([1, 2], [2])), - ("vop1_e64", [Format.VOP1, Format.VOP3A], 'VOP3A_instruction', itertools.product([1], [1])), - ("vop2_e64", [Format.VOP2, Format.VOP3A], 'VOP3A_instruction', itertools.product([1, 2], [2, 3])), - ("vopc_e64", [Format.VOPC, Format.VOP3A], 'VOP3A_instruction', itertools.product([1, 2], [2])), + ("vop1_e64", [Format.VOP1, Format.VOP3], 'VOP3_instruction', itertools.product([1], [1])), + ("vop2_e64", [Format.VOP2, Format.VOP3], 'VOP3_instruction', itertools.product([1, 2], [2, 3])), + ("vopc_e64", [Format.VOPC, Format.VOP3], 'VOP3_instruction', itertools.product([1, 2], [2])), ("flat", [Format.FLAT], 'FLAT_instruction', [(0, 3), (1, 2)]), ("global", [Format.GLOBAL], 'FLAT_instruction', [(0, 3), (1, 2)])] formats = [(f if len(f) == 5 else f + ('',)) for f in formats] |