From: Gert Wollny <gert.wollny@collabora.com>
Date: Tue, 14 Feb 2023 16:34:04 +0000 (+0100)
Subject: r600/sfn: set CF force flag always when starting a new block
X-Git-Tag: upstream/23.3.3~9320
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=557dc1494485a23f6b4da475214bd1d46be704a1;p=platform%2Fupstream%2Fmesa.git

r600/sfn: set CF force flag always when starting a new block

There is no reason not to do this, because we only start a new
block if a new CF block must be started.

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21347>
---

diff --git a/src/gallium/drivers/r600/sfn/sfn_scheduler.cpp b/src/gallium/drivers/r600/sfn/sfn_scheduler.cpp
index 247c3ba..2026dc8 100644
--- a/src/gallium/drivers/r600/sfn/sfn_scheduler.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_scheduler.cpp
@@ -509,7 +509,6 @@ BlockScheduler::schedule_alu(Shader::ShaderBlocks& out_blocks)
       } else {
          if (m_current_block->expected_ar_uses() == 0) {
             start_new_block(out_blocks, Block::alu);
-            m_current_block->set_instr_flag(Instr::force_cf);
 
             if (!m_current_block->try_reserve_kcache(*group))
                unreachable("Scheduling a group in a new block should always succeed");
@@ -566,7 +565,6 @@ BlockScheduler::schedule_alu(Shader::ShaderBlocks& out_blocks)
 
          // kcache reservation failed, so we have to start a new CF
          start_new_block(out_blocks, Block::alu);
-         m_current_block->set_instr_flag(Instr::force_cf);
       } else {
          return false;
       }
@@ -588,7 +586,6 @@ BlockScheduler::schedule_alu(Shader::ShaderBlocks& out_blocks)
       assert(!group->has_lds_group_start());
       assert(m_current_block->expected_ar_uses() == 0);
       start_new_block(out_blocks, Block::alu);
-      m_current_block->set_instr_flag(Instr::force_cf);
    }
 
    return success;
@@ -654,6 +651,7 @@ BlockScheduler::start_new_block(Shader::ShaderBlocks& out_blocks, Block::Type ty
       out_blocks.push_back(m_current_block);
       m_current_block =
          new Block(m_current_block->nesting_depth(), m_current_block->id());
+      m_current_block->set_instr_flag(Instr::force_cf);
    }
    m_current_block->set_type(type);
 }