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

Author: Rhys Perry <pendingchao...@gmail.com>
Date:   Fri Oct 13 19:56:24 2023 +0100

nir/loop_analyze: skip if basis/limit/comparison is vector

Replacement in try_eval_const_alu() doesn't work because the replacements
are always scalar. The callers also always give a scalar dest.

This is encountered when compiling a Redout shader under ASan.

Signed-off-by: Rhys Perry <pendingchao...@gmail.com>
Acked-by: Timothy Arceri <tarc...@itsqueeze.com>
Fixes: bc170e895f38 ("nir/loop_analyze: Use try_eval_const_alu and induction 
variable basis info")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26225>

---

 src/compiler/nir/nir_loop_analyze.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/compiler/nir/nir_loop_analyze.c 
b/src/compiler/nir/nir_loop_analyze.c
index 4c39de9d949..f468d2316e5 100644
--- a/src/compiler/nir/nir_loop_analyze.c
+++ b/src/compiler/nir/nir_loop_analyze.c
@@ -1050,6 +1050,10 @@ calculate_iterations(nir_def *basis, nir_def 
*limit_basis,
              induction_base_type);
    }
 
+   if (cond.def->num_components != 1 || basis->num_components != 1 ||
+       limit_basis->num_components != 1)
+      return -1;
+
    /* do-while loops can increment the starting value before the condition is
     * checked. e.g.
     *

Reply via email to