From 29ac834b1eb98992a4570fa011fe7e3d40fe0cfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20=C5=9Alusarz?= Date: Thu, 12 Nov 2020 20:13:26 +0100 Subject: [PATCH] nir: handle float atomics in nir_lower_memory_model MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcin Ślusarz Reviewed-by: Rhys Perry Fixes: 2adb337256f ("nir,radv/aco: add and use pass to lower make available/visible barriers") Part-of: (cherry picked from commit 2c3e2d69bd1e1ab715783f0ef41daf99519ed12e) --- .pick_status.json | 2 +- src/compiler/nir/nir_lower_memory_model.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index f41aa3eed87..2ed61be6351 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -184,7 +184,7 @@ "description": "nir: handle float atomics in nir_lower_memory_model", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "2adb337256f146b10b31365ac6ba8ab820d9014e" }, diff --git a/src/compiler/nir/nir_lower_memory_model.c b/src/compiler/nir/nir_lower_memory_model.c index e2cd1891668..eb16eb9f6eb 100644 --- a/src/compiler/nir/nir_lower_memory_model.c +++ b/src/compiler/nir/nir_lower_memory_model.c @@ -79,6 +79,10 @@ get_intrinsic_info(nir_intrinsic_instr *intrin, nir_variable_mode *modes, case nir_intrinsic_ssbo_atomic_xor: case nir_intrinsic_ssbo_atomic_exchange: case nir_intrinsic_ssbo_atomic_comp_swap: + case nir_intrinsic_ssbo_atomic_fadd: + case nir_intrinsic_ssbo_atomic_fcomp_swap: + case nir_intrinsic_ssbo_atomic_fmax: + case nir_intrinsic_ssbo_atomic_fmin: *modes = nir_var_mem_ssbo; *reads = true; *writes = true; @@ -101,6 +105,10 @@ get_intrinsic_info(nir_intrinsic_instr *intrin, nir_variable_mode *modes, case nir_intrinsic_global_atomic_xor: case nir_intrinsic_global_atomic_exchange: case nir_intrinsic_global_atomic_comp_swap: + case nir_intrinsic_global_atomic_fadd: + case nir_intrinsic_global_atomic_fcomp_swap: + case nir_intrinsic_global_atomic_fmax: + case nir_intrinsic_global_atomic_fmin: *modes = nir_var_mem_global; *reads = true; *writes = true; @@ -123,6 +131,10 @@ get_intrinsic_info(nir_intrinsic_instr *intrin, nir_variable_mode *modes, case nir_intrinsic_deref_atomic_xor: case nir_intrinsic_deref_atomic_exchange: case nir_intrinsic_deref_atomic_comp_swap: + case nir_intrinsic_deref_atomic_fadd: + case nir_intrinsic_deref_atomic_fmin: + case nir_intrinsic_deref_atomic_fmax: + case nir_intrinsic_deref_atomic_fcomp_swap: *modes = nir_src_as_deref(intrin->src[0])->modes; *reads = true; *writes = true;