mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-22 11:20:11 +01:00
intel/compiler: Add texture operation lowering pass
This pass combines the LOD or LOD bias and array index into a single 32-bit value since Xe2+ sampler messages requires us to do that. v2: (Alyssa) - Use nir_iand_imm instead of nir_iand and nir_imm_int - Use nir_trim_vector instead of nir_swizzle Signed-off-by: Sagar Ghuge <sagar.ghuge@intel.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27458>
This commit is contained in:
parent
646a7c864d
commit
73a3257968
3 changed files with 140 additions and 0 deletions
|
|
@ -209,6 +209,12 @@ struct brw_nir_lower_storage_image_opts {
|
|||
bool brw_nir_lower_storage_image(nir_shader *nir,
|
||||
const struct brw_nir_lower_storage_image_opts *opts);
|
||||
|
||||
struct brw_nir_lower_texture_opts {
|
||||
bool combined_lod_and_array_index;
|
||||
};
|
||||
bool brw_nir_lower_texture(nir_shader *nir,
|
||||
const struct brw_nir_lower_texture_opts *opts);
|
||||
|
||||
bool brw_nir_lower_mem_access_bit_sizes(nir_shader *shader,
|
||||
const struct
|
||||
intel_device_info *devinfo);
|
||||
|
|
|
|||
133
src/intel/compiler/brw_nir_lower_texture.c
Normal file
133
src/intel/compiler/brw_nir_lower_texture.c
Normal file
|
|
@ -0,0 +1,133 @@
|
|||
/*
|
||||
* Copyright © 2024 Intel Corporation
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||
* copy of this software and associated documentation files (the "Software"),
|
||||
* to deal in the Software without restriction, including without limitation
|
||||
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
* and/or sell copies of the Software, and to permit persons to whom the
|
||||
* Software is furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice (including the next
|
||||
* paragraph) shall be included in all copies or substantial portions of the
|
||||
* Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
* IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "compiler/nir/nir_builder.h"
|
||||
#include "brw_nir.h"
|
||||
|
||||
/**
|
||||
* Pack either the explicit LOD or LOD bias and the array index together.
|
||||
*/
|
||||
static bool
|
||||
pack_lod_and_array_index(nir_builder *b, nir_tex_instr *tex)
|
||||
{
|
||||
/* If 32-bit texture coordinates are used, pack either the explicit LOD or
|
||||
* LOD bias and the array index into a single (32-bit) value.
|
||||
*/
|
||||
int lod_index = nir_tex_instr_src_index(tex, nir_tex_src_lod);
|
||||
if (lod_index < 0) {
|
||||
lod_index = nir_tex_instr_src_index(tex, nir_tex_src_bias);
|
||||
|
||||
/* The explicit LOD or LOD bias may not be found if this lowering has
|
||||
* already occured. The explicit LOD may also not be found in some
|
||||
* cases where it is zero.
|
||||
*/
|
||||
if (lod_index < 0)
|
||||
return false;
|
||||
}
|
||||
|
||||
assert(nir_tex_instr_src_type(tex, lod_index) == nir_type_float);
|
||||
|
||||
/* Also do not perform this packing if the explicit LOD is zero. */
|
||||
if (tex->op == nir_texop_txl &&
|
||||
nir_src_is_const(tex->src[lod_index].src) &&
|
||||
nir_src_as_float(tex->src[lod_index].src) == 0.0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
const int coord_index = nir_tex_instr_src_index(tex, nir_tex_src_coord);
|
||||
assert(coord_index >= 0);
|
||||
|
||||
nir_def *lod = tex->src[lod_index].src.ssa;
|
||||
nir_def *coord = tex->src[coord_index].src.ssa;
|
||||
|
||||
assert(nir_tex_instr_src_type(tex, coord_index) == nir_type_float);
|
||||
|
||||
if (coord->bit_size < 32)
|
||||
return false;
|
||||
|
||||
b->cursor = nir_before_instr(&tex->instr);
|
||||
|
||||
/* First, combine the two values. The packing format is a little weird.
|
||||
* The explicit LOD / LOD bias is stored as float, as normal. However, the
|
||||
* array index is converted to an integer and smashed into the low 9 bits.
|
||||
*/
|
||||
const unsigned array_index = tex->coord_components - 1;
|
||||
|
||||
nir_def *clamped_ai =
|
||||
nir_umin(b,
|
||||
nir_f2u32(b, nir_fround_even(b, nir_channel(b, coord,
|
||||
array_index))),
|
||||
nir_imm_int(b, 511));
|
||||
|
||||
nir_def *lod_ai = nir_ior(b, nir_iand_imm(b, lod, 0xfffffe00), clamped_ai);
|
||||
|
||||
/* Second, replace the coordinate with a new value that has one fewer
|
||||
* component (i.e., drop the array index).
|
||||
*/
|
||||
nir_def *reduced_coord = nir_trim_vector(b, coord, 2);
|
||||
tex->coord_components--;
|
||||
|
||||
/* Finally, remove the old sources and add the new. */
|
||||
nir_src_rewrite(&tex->src[coord_index].src, reduced_coord);
|
||||
|
||||
nir_tex_instr_remove_src(tex, lod_index);
|
||||
nir_tex_instr_add_src(tex, nir_tex_src_backend1, lod_ai);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool
|
||||
brw_nir_lower_texture_instr(nir_builder *b, nir_instr *instr, void *cb_data)
|
||||
{
|
||||
if (instr->type != nir_instr_type_tex)
|
||||
return false;
|
||||
|
||||
const struct brw_nir_lower_texture_opts *opts = cb_data;
|
||||
nir_tex_instr *tex = nir_instr_as_tex(instr);
|
||||
|
||||
switch (tex->op) {
|
||||
case nir_texop_txl:
|
||||
case nir_texop_txb:
|
||||
if (tex->is_array &&
|
||||
tex->sampler_dim == GLSL_SAMPLER_DIM_CUBE &&
|
||||
opts->combined_lod_and_array_index) {
|
||||
return pack_lod_and_array_index(b, tex);
|
||||
}
|
||||
return false;
|
||||
default:
|
||||
/* Nothing to do */
|
||||
return false;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool
|
||||
brw_nir_lower_texture(nir_shader *shader,
|
||||
const struct brw_nir_lower_texture_opts *opts)
|
||||
{
|
||||
return nir_shader_instructions_pass(shader,
|
||||
brw_nir_lower_texture_instr,
|
||||
nir_metadata_none,
|
||||
(void *)opts);
|
||||
}
|
||||
|
|
@ -101,6 +101,7 @@ libintel_compiler_files = files(
|
|||
'brw_nir_lower_shading_rate_output.c',
|
||||
'brw_nir_lower_sparse.c',
|
||||
'brw_nir_lower_storage_image.c',
|
||||
'brw_nir_lower_texture.c',
|
||||
'brw_nir_opt_peephole_ffma.c',
|
||||
'brw_nir_opt_peephole_imul32x16.c',
|
||||
'brw_nir_rt.h',
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue