commit b21b901b46f5abe09619ceadc97e2082f11d27dd
author Ian Romanick <ian.d.romanick@intel.com> Tue Jul 12 15:34:23 2022 -0700
committer Marge Bot <emma+marge@anholt.net> Tue Jul 26 17:25:19 2022 +0000
tree 5e971b4ff2570db2d6fbc110b4c91b5632ce2beb
parent 1b17f8fc5a3fdb6e6b2a7b54e3cc319ea1fe9a5f

intel/fs: Don't pass flags to lower_urb_read_logical_send or lower_urb_write_logical_send

...because the flags can be inferred from the sources.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17605>

src/intel/compiler/brw_lower_logical_sends.cpp

diff --git a/src/intel/compiler/brw_lower_logical_sends.cpp b/src/intel/compiler/brw_lower_logical_sends.cpp
index 2ccd083..180e1d2 100644
--- a/src/intel/compiler/brw_lower_logical_sends.cpp
+++ b/src/intel/compiler/brw_lower_logical_sends.cpp
@@ -31,10 +31,11 @@
 using namespace brw;
 
 static void
-lower_urb_read_logical_send(const fs_builder &bld, fs_inst *inst,
-                            bool per_slot_present)
+lower_urb_read_logical_send(const fs_builder &bld, fs_inst *inst)
 {
    const intel_device_info *devinfo = bld.shader->devinfo;
+   const bool per_slot_present =
+      inst->src[URB_LOGICAL_SRC_PER_SLOT_OFFSETS].file != BAD_FILE;
 
    assert(inst->size_written % REG_SIZE == 0);
    assert(inst->header_size == 0);
@@ -75,10 +76,13 @@
 }
 
 static void
-lower_urb_write_logical_send(const fs_builder &bld, fs_inst *inst,
-                             bool per_slot_present, bool channel_mask_present)
+lower_urb_write_logical_send(const fs_builder &bld, fs_inst *inst)
 {
    const intel_device_info *devinfo = bld.shader->devinfo;
+   const bool per_slot_present =
+      inst->src[URB_LOGICAL_SRC_PER_SLOT_OFFSETS].file != BAD_FILE;
+   const bool channel_mask_present =
+      inst->src[URB_LOGICAL_SRC_CHANNEL_MASK].file != BAD_FILE;
 
    assert(inst->header_size == 0);
 
@@ -2724,23 +2728,15 @@
          break;
 
       case SHADER_OPCODE_URB_READ_LOGICAL:
-         lower_urb_read_logical_send(ibld, inst, false);
-         break;
       case SHADER_OPCODE_URB_READ_PER_SLOT_LOGICAL:
-         lower_urb_read_logical_send(ibld, inst, true);
+         lower_urb_read_logical_send(ibld, inst);
          break;
 
       case SHADER_OPCODE_URB_WRITE_LOGICAL:
-         lower_urb_write_logical_send(ibld, inst, false, false);
-         break;
       case SHADER_OPCODE_URB_WRITE_PER_SLOT_LOGICAL:
-         lower_urb_write_logical_send(ibld, inst, true, false);
-         break;
       case SHADER_OPCODE_URB_WRITE_MASKED_LOGICAL:
-         lower_urb_write_logical_send(ibld, inst, false, true);
-         break;
       case SHADER_OPCODE_URB_WRITE_MASKED_PER_SLOT_LOGICAL:
-         lower_urb_write_logical_send(ibld, inst, true, true);
+         lower_urb_write_logical_send(ibld, inst);
          break;
 
       default: