From 72a7d7d7a8dc46219d4131c01e5cda4ee5d66ecb Mon Sep 17 00:00:00 2001 From: Paulo Zanoni Date: Fri, 8 Apr 2022 15:48:05 -0700 Subject: [PATCH] intel/compiler: call ordered_unit() only once at update_inst_scoreboard() Call it once instead of calling the very same function for each source and destination. This should make those ternary operators a little easier to read, IMHO. Reviewed-by: Ian Romanick Signed-off-by: Paulo Zanoni Part-of: --- src/intel/compiler/brw_fs_scoreboard.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/intel/compiler/brw_fs_scoreboard.cpp b/src/intel/compiler/brw_fs_scoreboard.cpp index bb41facfc8d..0f7423492b7 100644 --- a/src/intel/compiler/brw_fs_scoreboard.cpp +++ b/src/intel/compiler/brw_fs_scoreboard.cpp @@ -998,6 +998,7 @@ namespace { const tgl_pipe p = inferred_exec_pipe(devinfo, inst); const ordered_address jp = p ? ordered_address(p, jps[ip].jp[IDX(p)]) : ordered_address(); + const bool is_ordered = ordered_unit(devinfo, inst, IDX(TGL_PIPE_ALL)); /* Track any source registers that may be fetched asynchronously by this * instruction, otherwise clear the dependency in order to avoid @@ -1007,8 +1008,7 @@ namespace { const dependency rd_dep = (inst->is_payload(i) || inst->is_math()) ? dependency(TGL_SBID_SRC, ip, exec_all) : - ordered_unit(devinfo, inst, IDX(TGL_PIPE_ALL)) ? - dependency(TGL_REGDIST_SRC, jp, exec_all) : + is_ordered ? dependency(TGL_REGDIST_SRC, jp, exec_all) : dependency::done; for (unsigned j = 0; j < regs_read(inst, i); j++) { @@ -1030,8 +1030,7 @@ namespace { /* Track any destination registers of this instruction. */ const dependency wr_dep = is_unordered(inst) ? dependency(TGL_SBID_DST, ip, exec_all) : - ordered_unit(devinfo, inst, IDX(TGL_PIPE_ALL)) ? - dependency(TGL_REGDIST_DST, jp, exec_all) : + is_ordered ? dependency(TGL_REGDIST_DST, jp, exec_all) : dependency(); if (inst->writes_accumulator_implicitly(devinfo))