Mesa (master): aco: fix GFX10 opcodes for some global/flat atomics

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: f1381e6715336fc9cf769eb591bf742659dfa9ec
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f1381e6715336fc9cf769eb591bf742659dfa9ec

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Tue Nov 26 21:06:35 2019 +0000

aco: fix GFX10 opcodes for some global/flat atomics

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Daniel Schürmann <daniel at schuermann.dev>

---

 src/amd/compiler/aco_opcodes.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/amd/compiler/aco_opcodes.py b/src/amd/compiler/aco_opcodes.py
index 08337a18d22..5f74998a421 100644
--- a/src/amd/compiler/aco_opcodes.py
+++ b/src/amd/compiler/aco_opcodes.py
@@ -1451,9 +1451,9 @@ FLAT = {
    (0x51, 0x61, 0x51, "flat_atomic_cmpswap_x2"),
    (0x52, 0x62, 0x52, "flat_atomic_add_x2"),
    (0x53, 0x63, 0x53, "flat_atomic_sub_x2"),
-   (0x55, 0x64, 0x54, "flat_atomic_smin_x2"),
-   (0x56, 0x65, 0x55, "flat_atomic_umin_x2"),
-   (0x57, 0x66, 0x56, "flat_atomic_smax_x2"),
+   (0x55, 0x64, 0x55, "flat_atomic_smin_x2"),
+   (0x56, 0x65, 0x56, "flat_atomic_umin_x2"),
+   (0x57, 0x66, 0x57, "flat_atomic_smax_x2"),
    (0x58, 0x67, 0x58, "flat_atomic_umax_x2"),
    (0x59, 0x68, 0x59, "flat_atomic_and_x2"),
    (0x5a, 0x69, 0x5a, "flat_atomic_or_x2"),
@@ -1511,9 +1511,9 @@ GLOBAL = {
    (0x61, 0x51, "global_atomic_cmpswap_x2"),
    (0x62, 0x52, "global_atomic_add_x2"),
    (0x63, 0x53, "global_atomic_sub_x2"),
-   (0x64, 0x54, "global_atomic_smin_x2"),
-   (0x65, 0x55, "global_atomic_umin_x2"),
-   (0x66, 0x56, "global_atomic_smax_x2"),
+   (0x64, 0x55, "global_atomic_smin_x2"),
+   (0x65, 0x56, "global_atomic_umin_x2"),
+   (0x66, 0x57, "global_atomic_smax_x2"),
    (0x67, 0x58, "global_atomic_umax_x2"),
    (0x68, 0x59, "global_atomic_and_x2"),
    (0x69, 0x5a, "global_atomic_or_x2"),