Module: Mesa Branch: main Commit: 284f0c9a57e17b14c044c04c7cf9ae77d6694492 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=284f0c9a57e17b14c044c04c7cf9ae77d6694492
Author: Kenneth Graunke <[email protected]> Date: Mon Jan 9 15:37:30 2023 -0800 intel/compiler: Add an lsc_op_num_data_values() helper There are a number of places that need to know how many operands an LSC atomic takes (0 for inc/dec, 1 for most things, 2 for cmpxchg). We can add a helper for that and eliminate some code (with more to come). Reviewed-by: Lionel Landwerlin <[email protected]> Reviewed-by: Rohan Garg <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20604> --- src/intel/compiler/brw_eu.h | 21 +++++++++++++++++++ src/intel/compiler/brw_fs.cpp | 49 ++++--------------------------------------- 2 files changed, 25 insertions(+), 45 deletions(-) diff --git a/src/intel/compiler/brw_eu.h b/src/intel/compiler/brw_eu.h index 999c0e8396f..a08b83a79dc 100644 --- a/src/intel/compiler/brw_eu.h +++ b/src/intel/compiler/brw_eu.h @@ -1240,6 +1240,27 @@ lsc_opcode_is_atomic(enum lsc_opcode opcode) } } +static inline unsigned +lsc_op_num_data_values(unsigned _op) +{ + enum lsc_opcode op = (enum lsc_opcode) _op; + + switch (op) { + case LSC_OP_ATOMIC_CMPXCHG: + case LSC_OP_ATOMIC_FCMPXCHG: + return 2; + case LSC_OP_ATOMIC_INC: + case LSC_OP_ATOMIC_DEC: + case LSC_OP_LOAD: + case LSC_OP_LOAD_CMASK: + case LSC_OP_FENCE: + /* XXX: actually check docs */ + return 0; + default: + return 1; + } +} + static inline unsigned lsc_op_to_legacy_atomic(unsigned _op) { diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp index fc4fb43dc77..e7bc721579c 100644 --- a/src/intel/compiler/brw_fs.cpp +++ b/src/intel/compiler/brw_fs.cpp @@ -781,34 +781,11 @@ fs_inst::components_read(unsigned i) const case SHADER_OPCODE_A64_UNTYPED_ATOMIC_LOGICAL: case SHADER_OPCODE_A64_UNTYPED_ATOMIC_INT16_LOGICAL: case SHADER_OPCODE_A64_UNTYPED_ATOMIC_INT64_LOGICAL: - assert(src[2].file == IMM); - if (i == 1) { - /* Data source */ - const unsigned op = src[2].ud; - switch (op) { - case LSC_OP_ATOMIC_INC: - case LSC_OP_ATOMIC_DEC: - return 0; - case LSC_OP_ATOMIC_CMPXCHG: - return 2; - default: - return 1; - } - } else { - return 1; - } - case SHADER_OPCODE_A64_UNTYPED_ATOMIC_FLOAT16_LOGICAL: case SHADER_OPCODE_A64_UNTYPED_ATOMIC_FLOAT32_LOGICAL: case SHADER_OPCODE_A64_UNTYPED_ATOMIC_FLOAT64_LOGICAL: assert(src[2].file == IMM); - if (i == 1) { - /* Data source */ - const unsigned op = src[2].ud; - return op == LSC_OP_ATOMIC_FCMPXCHG ? 2 : 1; - } else { - return 1; - } + return i == 1 ? lsc_op_num_data_values(src[2].ud) : 1; case SHADER_OPCODE_BYTE_SCATTERED_READ_LOGICAL: case SHADER_OPCODE_DWORD_SCATTERED_READ_LOGICAL: @@ -830,6 +807,7 @@ fs_inst::components_read(unsigned i) const return 1; case SHADER_OPCODE_UNTYPED_ATOMIC_LOGICAL: + case SHADER_OPCODE_UNTYPED_ATOMIC_FLOAT_LOGICAL: case SHADER_OPCODE_TYPED_ATOMIC_LOGICAL: { assert(src[SURFACE_LOGICAL_SRC_IMM_DIMS].file == IMM && src[SURFACE_LOGICAL_SRC_IMM_ARG].file == IMM); @@ -838,31 +816,12 @@ fs_inst::components_read(unsigned i) const if (i == SURFACE_LOGICAL_SRC_ADDRESS) return src[SURFACE_LOGICAL_SRC_IMM_DIMS].ud; /* Surface operation source. */ - else if (i == SURFACE_LOGICAL_SRC_DATA && op == LSC_OP_ATOMIC_CMPXCHG) - return 2; - else if (i == SURFACE_LOGICAL_SRC_DATA && - (op == LSC_OP_ATOMIC_INC || op == LSC_OP_ATOMIC_DEC)) - return 0; - else - return 1; + else if (i == SURFACE_LOGICAL_SRC_DATA) + return lsc_op_num_data_values(op); } case FS_OPCODE_INTERPOLATE_AT_PER_SLOT_OFFSET: return (i == 0 ? 2 : 1); - case SHADER_OPCODE_UNTYPED_ATOMIC_FLOAT_LOGICAL: { - assert(src[SURFACE_LOGICAL_SRC_IMM_DIMS].file == IMM && - src[SURFACE_LOGICAL_SRC_IMM_ARG].file == IMM); - const unsigned op = src[SURFACE_LOGICAL_SRC_IMM_ARG].ud; - /* Surface coordinates. */ - if (i == SURFACE_LOGICAL_SRC_ADDRESS) - return src[SURFACE_LOGICAL_SRC_IMM_DIMS].ud; - /* Surface operation source. */ - else if (i == SURFACE_LOGICAL_SRC_DATA && op == LSC_OP_ATOMIC_FCMPXCHG) - return 2; - else - return 1; - } - case SHADER_OPCODE_URB_WRITE_LOGICAL: if (i == URB_LOGICAL_SRC_DATA) return mlen - 1 -
