From c28539a2fed956002c56cc9e0fe4a7c233ed17ac Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Fri, 5 Aug 2022 14:58:09 -0700 Subject: [PATCH] intel/compiler: Use enum xe2_lsc_cache_load on xe2 Signed-off-by: Jordan Justen Reviewed-by: Kenneth Graunke Part-of: --- src/intel/compiler/brw_fs.cpp | 2 +- src/intel/compiler/brw_fs_reg_allocate.cpp | 4 ++-- src/intel/compiler/brw_lower_logical_sends.cpp | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp index d4545ca..c5d7c1f 100644 --- a/src/intel/compiler/brw_fs.cpp +++ b/src/intel/compiler/brw_fs.cpp @@ -1677,7 +1677,7 @@ fs_visitor::assign_curb_setup() LSC_DATA_SIZE_D32, num_regs * 8 /* num_channels */, true /* transpose */, - LSC_CACHE_LOAD_L1STATE_L3MOCS, + LSC_CACHE(devinfo, LOAD, L1STATE_L3MOCS), true /* has_dest */); send->header_size = 0; send->mlen = lsc_msg_desc_src0_len(devinfo, send->desc); diff --git a/src/intel/compiler/brw_fs_reg_allocate.cpp b/src/intel/compiler/brw_fs_reg_allocate.cpp index 852c03e..eb8c360 100644 --- a/src/intel/compiler/brw_fs_reg_allocate.cpp +++ b/src/intel/compiler/brw_fs_reg_allocate.cpp @@ -861,7 +861,7 @@ fs_reg_alloc::emit_unspill(const fs_builder &bld, LSC_DATA_SIZE_D32, use_transpose ? reg_size * 8 : 1 /* num_channels */, use_transpose, - LSC_CACHE_LOAD_L1STATE_L3MOCS, + LSC_CACHE(devinfo, LOAD, L1STATE_L3MOCS), true /* has_dest */); unspill_inst->header_size = 0; unspill_inst->mlen = @@ -958,7 +958,7 @@ fs_reg_alloc::emit_spill(const fs_builder &bld, LSC_DATA_SIZE_D32, 1 /* num_channels */, false /* transpose */, - LSC_CACHE_LOAD_L1STATE_L3MOCS, + LSC_CACHE(devinfo, LOAD, L1STATE_L3MOCS), false /* has_dest */); spill_inst->header_size = 0; spill_inst->mlen = lsc_msg_desc_src0_len(devinfo, spill_inst->desc); diff --git a/src/intel/compiler/brw_lower_logical_sends.cpp b/src/intel/compiler/brw_lower_logical_sends.cpp index 087641d..699623f 100644 --- a/src/intel/compiler/brw_lower_logical_sends.cpp +++ b/src/intel/compiler/brw_lower_logical_sends.cpp @@ -2082,7 +2082,7 @@ lower_lsc_surface_logical_send(const fs_builder &bld, fs_inst *inst) 1 /* num_coordinates */, LSC_DATA_SIZE_D32, arg.ud /* num_channels */, false /* transpose */, - LSC_CACHE_LOAD_L1STATE_L3MOCS, + LSC_CACHE(devinfo, LOAD, L1STATE_L3MOCS), true /* has_dest */); break; case SHADER_OPCODE_UNTYPED_SURFACE_WRITE_LOGICAL: @@ -2119,7 +2119,7 @@ lower_lsc_surface_logical_send(const fs_builder &bld, fs_inst *inst) lsc_bits_to_data_size(arg.ud), 1 /* num_channels */, false /* transpose */, - LSC_CACHE_LOAD_L1STATE_L3MOCS, + LSC_CACHE(devinfo, LOAD, L1STATE_L3MOCS), true /* has_dest */); break; case SHADER_OPCODE_BYTE_SCATTERED_WRITE_LOGICAL: @@ -2221,7 +2221,7 @@ lower_lsc_block_logical_send(const fs_builder &bld, fs_inst *inst) LSC_DATA_SIZE_D32, arg.ud /* num_channels */, true /* transpose */, - LSC_CACHE_LOAD_L1STATE_L3MOCS, + LSC_CACHE(devinfo, LOAD, L1STATE_L3MOCS), !write /* has_dest */); inst->mlen = lsc_msg_desc_src0_len(devinfo, inst->desc); @@ -2392,7 +2392,7 @@ lower_lsc_a64_logical_send(const fs_builder &bld, fs_inst *inst) 1 /* num_coordinates */, LSC_DATA_SIZE_D32, arg /* num_channels */, false /* transpose */, - LSC_CACHE_LOAD_L1STATE_L3MOCS, + LSC_CACHE(devinfo, LOAD, L1STATE_L3MOCS), true /* has_dest */); break; case SHADER_OPCODE_A64_UNTYPED_WRITE_LOGICAL: @@ -2411,7 +2411,7 @@ lower_lsc_a64_logical_send(const fs_builder &bld, fs_inst *inst) lsc_bits_to_data_size(arg), 1 /* num_channels */, false /* transpose */, - LSC_CACHE_LOAD_L1STATE_L3MOCS, + LSC_CACHE(devinfo, LOAD, L1STATE_L3MOCS), true /* has_dest */); break; case SHADER_OPCODE_A64_BYTE_SCATTERED_WRITE_LOGICAL: @@ -2453,7 +2453,7 @@ lower_lsc_a64_logical_send(const fs_builder &bld, fs_inst *inst) LSC_DATA_SIZE_D32, arg /* num_channels */, true /* transpose */, - LSC_CACHE_LOAD_L1STATE_L3MOCS, + LSC_CACHE(devinfo, LOAD, L1STATE_L3MOCS), true /* has_dest */); break; case SHADER_OPCODE_A64_OWORD_BLOCK_WRITE_LOGICAL: @@ -2467,7 +2467,7 @@ lower_lsc_a64_logical_send(const fs_builder &bld, fs_inst *inst) LSC_DATA_SIZE_D32, arg /* num_channels */, true /* transpose */, - LSC_CACHE_LOAD_L1STATE_L3MOCS, + LSC_CACHE(devinfo, LOAD, L1STATE_L3MOCS), false /* has_dest */); break; @@ -2678,7 +2678,7 @@ lower_lsc_varying_pull_constant_logical_send(const fs_builder &bld, LSC_DATA_SIZE_D32, 4 /* num_channels */, false /* transpose */, - LSC_CACHE_LOAD_L1STATE_L3MOCS, + LSC_CACHE(devinfo, LOAD, L1STATE_L3MOCS), true /* has_dest */); inst->mlen = lsc_msg_desc_src0_len(devinfo, inst->desc); @@ -2693,7 +2693,7 @@ lower_lsc_varying_pull_constant_logical_send(const fs_builder &bld, LSC_DATA_SIZE_D32, 1 /* num_channels */, false /* transpose */, - LSC_CACHE_LOAD_L1STATE_L3MOCS, + LSC_CACHE(devinfo, LOAD, L1STATE_L3MOCS), true /* has_dest */); inst->mlen = lsc_msg_desc_src0_len(devinfo, inst->desc); @@ -3417,7 +3417,7 @@ fs_visitor::lower_uniform_pull_constant_loads() LSC_DATA_SIZE_D32, inst->size_written / 4, true /* transpose */, - LSC_CACHE_LOAD_L1STATE_L3MOCS, + LSC_CACHE(devinfo, LOAD, L1STATE_L3MOCS), true /* has_dest */); /* Update the original instruction. */ -- 2.7.4