From 82512a163bac905a526449db88705d6534792d83 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Thu, 8 Oct 2020 15:54:15 +1000 Subject: [PATCH] gallivm: lower flrp for all sizes. This fixes: builtin-float-mix-1.0.generated.cl Reviewed-by: Roland Scheidegger Part-of: --- .gitlab-ci/piglit/cl.txt | 7 +++---- src/gallium/auxiliary/gallivm/lp_bld_nir.c | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/piglit/cl.txt b/.gitlab-ci/piglit/cl.txt index a19649ad2aa..73bfe9ce1f0 100644 --- a/.gitlab-ci/piglit/cl.txt +++ b/.gitlab-ci/piglit/cl.txt @@ -56,7 +56,6 @@ program/execute/builtin/builtin-float-cos-1.0.generated: timeout program/execute/builtin/builtin-float-isfinite-1.0.generated: crash program/execute/builtin/builtin-float-isnormal-1.0.generated: crash program/execute/builtin/builtin-float-ldexp-1.0.generated: fail -program/execute/builtin/builtin-float-mix-1.0.generated: crash program/execute/builtin/builtin-float-sin-1.0.generated: timeout program/execute/builtin/builtin-float-sincos-1.0.generated: timeout program/execute/builtin/builtin-float-tan-1.0.generated: timeout @@ -98,9 +97,9 @@ program/execute/vstore/vstore-half-private: skip summary: name: results ---- -------- - pass: 3766 + pass: 3774 fail: 14 - crash: 6 + crash: 5 skip: 73 timeout: 4 warn: 0 @@ -110,4 +109,4 @@ summary: changes: 0 fixes: 0 regressions: 0 - total: 3863 + total: 3870 diff --git a/src/gallium/auxiliary/gallivm/lp_bld_nir.c b/src/gallium/auxiliary/gallivm/lp_bld_nir.c index 18ff31c3a02..a8988f6b173 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_nir.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_nir.c @@ -2240,6 +2240,8 @@ void lp_build_opt_nir(struct nir_shader *nir) NIR_PASS_V(nir, nir_lower_tex, &lower_tex_options); NIR_PASS_V(nir, nir_lower_frexp); + NIR_PASS_V(nir, nir_lower_flrp, 16|32|64, true); + do { progress = false; NIR_PASS_V(nir, nir_opt_constant_folding);