Mesa (master): freedreno/ir3: avoid applying (sat) on bary.f

[GitLab Mirror]

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

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Sat May 16 23:59:40 2020 -0400

freedreno/ir3: avoid applying (sat) on bary.f

This causes failures on a3xx resulting in the non-sensical dEQP failures
on packUnorm2x16. The same test uses ldlv on a4xx+, so just disallow
(sat) on bary.f on all generations.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5074>

---

 .gitlab-ci/deqp-freedreno-a307-fails.txt | 3 ---
 src/freedreno/ir3/ir3_compiler_nir.c     | 5 +++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci/deqp-freedreno-a307-fails.txt b/.gitlab-ci/deqp-freedreno-a307-fails.txt
index 557ff1a1745..3f50ba31186 100644
--- a/.gitlab-ci/deqp-freedreno-a307-fails.txt
+++ b/.gitlab-ci/deqp-freedreno-a307-fails.txt
@@ -235,9 +235,6 @@ dEQP-GLES3.functional.rasterizer_discard.scissor.write_stencil_points
 dEQP-GLES3.functional.rasterizer_discard.scissor.write_stencil_triangle_fan
 dEQP-GLES3.functional.rasterizer_discard.scissor.write_stencil_triangles
 dEQP-GLES3.functional.rasterizer_discard.scissor.write_stencil_triangle_strip
-dEQP-GLES3.functional.shaders.builtin_functions.pack_unpack.packunorm2x16_highp_fragment
-dEQP-GLES3.functional.shaders.builtin_functions.pack_unpack.packunorm2x16_lowp_fragment
-dEQP-GLES3.functional.shaders.builtin_functions.pack_unpack.packunorm2x16_mediump_fragment
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.float_highp
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.float_mediump
 dEQP-GLES3.functional.shaders.derivate.dfdx.fastest.fbo_msaa4.vec2_highp
diff --git a/src/freedreno/ir3/ir3_compiler_nir.c b/src/freedreno/ir3/ir3_compiler_nir.c
index 7ba65e1498e..0bfdb7adf38 100644
--- a/src/freedreno/ir3/ir3_compiler_nir.c
+++ b/src/freedreno/ir3/ir3_compiler_nir.c
@@ -430,9 +430,14 @@ emit_alu(struct ir3_context *ctx, nir_alu_instr *alu)
 		 * src instruction and create a mov.  This is easier for cp
 		 * to eliminate.
 		 *
+		 * NOTE: a3xx definitely seen not working with flat bary.f. Same test
+		 * uses ldlv on a4xx+, so not definitive. Seems rare enough to apply
+		 * everywhere.
+		 *
 		 * TODO probably opc_cat==4 is ok too
 		 */
 		if (alu->src[0].src.is_ssa &&
+				src[0]->opc != OPC_BARY_F &&
 				(list_length(&alu->src[0].src.ssa->uses) == 1) &&
 				((opc_cat(src[0]->opc) == 2) || (opc_cat(src[0]->opc) == 3))) {
 			src[0]->flags |= IR3_INSTR_SAT;