Mesa (main): r600: Add support for TGSI_OPCODE_ATOMIMIN and IMAX

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 4f3736595f03ba3055df654aad34e771bbe81850
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4f3736595f03ba3055df654aad34e771bbe81850

Author: Gert Wollny <gert.wollny at collabora.com>
Date:   Mon Apr 25 08:41:47 2022 +0200

r600: Add support for TGSI_OPCODE_ATOMIMIN and IMAX

With NTT these opcodes are now emitted and need to be handled.

Fixes: a4840e15ab77b44a72cabd7d503172e8357477eb
   r600: Use nir-to-tgsi instead of TGSI when the NIR debug opt is disabled.

Signed-off-by: Gert Wollny <gert.wollny at collabora.com>
Reviewed-by: Emma Anholt <emma at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16130>

---

 src/gallium/drivers/r600/ci/r600-turks-fails.txt | 2 --
 src/gallium/drivers/r600/r600_shader.c           | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/r600/ci/r600-turks-fails.txt b/src/gallium/drivers/r600/ci/r600-turks-fails.txt
index fc839f80cc8..7ab129e482a 100644
--- a/src/gallium/drivers/r600/ci/r600-turks-fails.txt
+++ b/src/gallium/drivers/r600/ci/r600-turks-fails.txt
@@ -874,8 +874,6 @@ spec at arb_sample_shading@samplemask 8 at noms mask_in_one,Fail
 # "find_hw_atomic_counter: Assertion `0' failed."
 spec at arb_shader_atomic_counter_ops@execution at atomic-counter-array-out-of-bounds-access,Crash
 
-spec at arb_shader_atomic_counter_ops@execution at all_touch_test,Fail
-
 spec at arb_shader_image_load_store@host-mem-barrier,Fail
 spec at arb_shader_image_load_store@host-mem-barrier at Atomic counter/RaW/full barrier test/64x64,Fail
 spec at arb_shader_image_load_store@host-mem-barrier at Atomic counter/RaW/one bit barrier test/16x16,Fail
diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index 6727d92b04e..de1181062eb 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -9393,6 +9393,10 @@ static int get_gds_op(int opcode)
 		return FETCH_OP_GDS_MIN_UINT_RET;
 	case TGSI_OPCODE_ATOMUMAX:
 		return FETCH_OP_GDS_MAX_UINT_RET;
+        case TGSI_OPCODE_ATOMIMIN:
+		return FETCH_OP_GDS_MIN_INT_RET;
+	case TGSI_OPCODE_ATOMIMAX:
+		return FETCH_OP_GDS_MAX_INT_RET;
 	case TGSI_OPCODE_ATOMXCHG:
 		return FETCH_OP_GDS_XCHG_RET;
 	case TGSI_OPCODE_ATOMCAS: