From 7c9eb8b289bb6fe891cae78377e94589299afeb4 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Wed, 2 Oct 2024 14:25:16 -0700 Subject: [PATCH] intel/brw: Make a ubld temporary in emit_barrier() Saves typing .exec_all() in a lot of places. Backport-to: 24.2 Reviewed-by: Caio Oliveira Reviewed-by: Ian Romanick Part-of: --- src/intel/compiler/brw_fs_nir.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/intel/compiler/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp index ee5ef566be7..67f57d9deac 100644 --- a/src/intel/compiler/brw_fs_nir.cpp +++ b/src/intel/compiler/brw_fs_nir.cpp @@ -2931,6 +2931,7 @@ emit_barrier(nir_to_brw_state &ntb) { const intel_device_info *devinfo = ntb.devinfo; const fs_builder &bld = ntb.bld; + const fs_builder ubld = bld.exec_all(); fs_visitor &s = ntb.s; /* We are getting the barrier ID from the compute shader header */ @@ -2939,26 +2940,25 @@ emit_barrier(nir_to_brw_state &ntb) brw_reg payload = brw_vgrf(s.alloc.allocate(1), BRW_TYPE_UD); /* Clear the message payload */ - bld.exec_all().group(8, 0).MOV(payload, brw_imm_ud(0u)); + ubld.group(8, 0).MOV(payload, brw_imm_ud(0u)); if (devinfo->verx10 >= 125) { setup_barrier_message_payload_gfx125(bld, payload); } else { assert(gl_shader_stage_is_compute(s.stage)); - const uint32_t barrier_id_mask = - devinfo->ver == 9 ? 0x8f000000u : 0x7f000000u; + brw_reg barrier_id_mask = + brw_imm_ud(devinfo->ver == 9 ? 0x8f000000u : 0x7f000000u); /* Copy the barrier id from r0.2 to the message payload reg.2 */ brw_reg r0_2 = brw_reg(retype(brw_vec1_grf(0, 2), BRW_TYPE_UD)); - bld.exec_all().group(1, 0).AND(component(payload, 2), r0_2, - brw_imm_ud(barrier_id_mask)); + ubld.group(1, 0).AND(component(payload, 2), r0_2, barrier_id_mask); } /* Emit a gateway "barrier" message using the payload we set up, followed * by a wait instruction. */ - bld.exec_all().emit(SHADER_OPCODE_BARRIER, reg_undef, payload); + ubld.emit(SHADER_OPCODE_BARRIER, reg_undef, payload); } static void