fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 02:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

jay: fix simd split swsb bugs

Browse source 
this is subtle, but the relevant igc:

  // In case of shooting down of this instruction, we need to add sync to
  // preserve the swsb id sync, so that it's safe to clear the dep
  if (currInst.hasPredication() ||
      (currInst.getExecSize() != dep.getInstruction()->getExecSize()) ||
      (currInst.getChannelOffset() != dep.getInstruction()->getChannelOffset()))
    needSyncForShootDownInst = true;

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40960>
This commit is contained in:
Alyssa Rosenzweig 2026-04-13 19:06:08 -04:00 • committed by Marge Bot
parent e66bfbd691
commit e84cba531b
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/intel/compiler/jay/jay_lower_scoreboard.c
View file

@ -285,11 +285,16 @@ lower_regdist_local(jay_function *func, jay_block *block, u32_per_pipe *access)
};
/* Fold the immediate preceding SYNC.nop into this instruction, allowing
* us to wait on both ALU and a SEND in the same annotation.
* us to wait on both ALU and a SEND in the same annotation. We cannot do
* this safely in the presence of predication or SIMD splitting that could
* cause any part of the instruction to get shot down, skipping the sync
* for future instructions (at least not without more tricky logic).
*/
if (last_sync &&
jay_sync_op(last_sync) == TGL_SYNC_NOP &&
I->dep.mode == TGL_SBID_NULL &&
!I->predication &&
!jay_simd_split(func->shader, I) &&
(I->dep.regdist == 0 ||
inferred_sync_pipe(func->shader->devinfo, I) == I->dep.pipe)) {

12
src/intel/compiler/jay/jay_to_binary.c
View file

@ -246,13 +246,15 @@ emit(struct brw_codegen *p,
unsigned exec_size = jay_simd_width_physical(f->shader, I);
// jay_print_inst(stdout, (jay_inst *) I);
/* Fix up SWSB dependencies for SIMD split instructions. The latter
* instructions do not need to redundantly wait on an SBID but might
* replicate their regdists.
*/
/* Replicate the SWSB regdist for SIMD split instructions if needed */
struct tgl_swsb dep =
simd_offs && !I->replicate_dep ? tgl_swsb_null() : I->dep;
dep.mode = simd_offs ? TGL_SBID_NULL : dep.mode;
/* We do not allow SBID dependencies on SIMD split instructions since
* individual groups could get shot down. This would require more tracking
* and is unclear whether it's beneficial.
*/
assert(simd_offs == 0 || I->dep.mode == TGL_SBID_NULL);
if (I->decrement_dep) {
unsigned delta = simd_offs * jay_macro_length(I);