Mesa (master): lima/gpir: fix alu check miss last store slot

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Sun Apr 14 05:10:42 UTC 2019


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

Author: Qiang Yu <yuq825 at gmail.com>
Date:   Fri Apr 12 11:35:34 2019 +0800

lima/gpir: fix alu check miss last store slot

Fixes: 92d7ca4b1cd "gallium: add lima driver"
Signed-off-by: Qiang Yu <yuq825 at gmail.com>
Reviewed-by: Vasily Khoruzhick <anarsoul at gmail.com>

---

 src/gallium/drivers/lima/ir/gp/instr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/lima/ir/gp/instr.c b/src/gallium/drivers/lima/ir/gp/instr.c
index 0ff7e7eabc2..158a9a93fd4 100644
--- a/src/gallium/drivers/lima/ir/gp/instr.c
+++ b/src/gallium/drivers/lima/ir/gp/instr.c
@@ -90,7 +90,7 @@ static bool gpir_instr_insert_alu_check(gpir_instr *instr, gpir_node *node)
     * complex1 won't be any of this instr's store node's child,
     * because it has two instr latency before store can use it.
     */
-   for (int i = GPIR_INSTR_SLOT_STORE0; i < GPIR_INSTR_SLOT_STORE3; i++) {
+   for (int i = GPIR_INSTR_SLOT_STORE0; i <= GPIR_INSTR_SLOT_STORE3; i++) {
       gpir_store_node *s = gpir_node_to_store(instr->slots[i]);
       if (s && s->child == node) {
          /* acc node may consume 2 slots, so even it's the child of a
@@ -119,7 +119,7 @@ static void gpir_instr_remove_alu(gpir_instr *instr, gpir_node *node)
 {
    int consume_slot = gpir_instr_get_consume_slot(instr, node);
 
-   for (int i = GPIR_INSTR_SLOT_STORE0; i < GPIR_INSTR_SLOT_STORE3; i++) {
+   for (int i = GPIR_INSTR_SLOT_STORE0; i <= GPIR_INSTR_SLOT_STORE3; i++) {
       gpir_store_node *s = gpir_node_to_store(instr->slots[i]);
       if (s && s->child == node) {
          instr->alu_num_slot_needed_by_store++;




More information about the mesa-commit mailing list