Mesa (staging/21.3): freedreno/ir3: Fix off-by-one in prefetch safety assert.

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: 1459a05696dbba4e7732f5d5564606ec85f14124
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1459a05696dbba4e7732f5d5564606ec85f14124

Author: Emma Anholt <emma at anholt.net>
Date:   Wed Nov  3 13:29:28 2021 -0700

freedreno/ir3: Fix off-by-one in prefetch safety assert.

This looks like just a typo, we allow up to == 0xf in the lowering pass.

Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13668>
(cherry picked from commit 34739cb6e28c725a2ebd95d32dc6b8e90f32cace)

---

 .pick_status.json                         | 2 +-
 src/freedreno/ci/freedreno-a630-fails.txt | 3 ---
 src/freedreno/ir3/ir3_compiler_nir.c      | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 748bd1c9c92..3a4027f5c3f 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -220,7 +220,7 @@
         "description": "freedreno/ir3: Fix off-by-one in prefetch safety assert.",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt
index 4da3268b52f..aead328e822 100644
--- a/src/freedreno/ci/freedreno-a630-fails.txt
+++ b/src/freedreno/ci/freedreno-a630-fails.txt
@@ -101,9 +101,6 @@ spec at arb_arrays_of_arrays@execution at image_store@basic-imagestore-mixed-const-non
 spec at arb_arrays_of_arrays@execution at image_store@basic-imagestore-mixed-const-non-const-uniform-index,Crash
 spec at arb_arrays_of_arrays@execution at image_store@basic-imagestore-non-const-uniform-index,Crash
 
-# "shader_runner: ../src/freedreno/ir3/ir3_compiler_nir.c:3928: collect_tex_prefetches: Assertion `fetch->samp_id < 0xf' failed."
-spec at arb_arrays_of_arrays@execution at sampler@fs-struct-const-index-sampler-const-index,Crash
-
 spec at arb_compute_shader@execution at border-color,Fail
 spec at arb_depth_buffer_float@fbo-clear-formats stencil,Fail
 spec at arb_depth_buffer_float@fbo-clear-formats stencil at GL_DEPTH32F_STENCIL8,Fail
diff --git a/src/freedreno/ir3/ir3_compiler_nir.c b/src/freedreno/ir3/ir3_compiler_nir.c
index d3fe7a69342..62c6e849422 100644
--- a/src/freedreno/ir3/ir3_compiler_nir.c
+++ b/src/freedreno/ir3/ir3_compiler_nir.c
@@ -3951,7 +3951,7 @@ collect_tex_prefetches(struct ir3_context *ctx, struct ir3 *ir)
              */
             assert(fetch->dst <= 0x3f);
             assert(fetch->tex_id <= 0x1f);
-            assert(fetch->samp_id < 0xf);
+            assert(fetch->samp_id <= 0xf);
 
             ctx->so->total_in =
                MAX2(ctx->so->total_in, instr->prefetch.input_offset + 2);