AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir/lower_shader_calls: fix align_offset

Browse Source 
I don't think this does anything at the moment, because all accesses are
scalar aligned.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24350>
This commit is contained in:
Rhys Perry
2023-07-26 17:01:44 +01:00
committed by Marge Bot
parent 5a7efccdc3
commit afb465013f
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/nir/nir_lower_shader_calls.c
+18 -11
View File
@@ -1348,17 +1348,20 @@ lower_stack_instr_to_scratch(struct nir_builder *b, nir_instr *instr, void *data
nir_def *addr = nir_iadd_imm(b,
nir_load_scratch_base_ptr(b, 1, 64, 1),
nir_intrinsic_base(stack));
data = nir_load_global(b, addr,
nir_intrinsic_align_mul(stack),
stack->def.num_components,
stack->def.bit_size);
data = nir_build_load_global(b,
stack->def.num_components,
stack->def.bit_size,
addr,
.align_mul = nir_intrinsic_align_mul(stack),
.align_offset = nir_intrinsic_align_offset(stack));
} else {
assert(state->address_format == nir_address_format_32bit_offset);
data = nir_load_scratch(b,
old_data->num_components,
old_data->bit_size,
nir_imm_int(b, nir_intrinsic_base(stack)),
.align_mul = nir_intrinsic_align_mul(stack));
.align_mul = nir_intrinsic_align_mul(stack),
.align_offset = nir_intrinsic_align_offset(stack));
}
nir_def_rewrite_uses(old_data, data);
break;
@@ -1863,17 +1866,20 @@ split_stack_components_instr(struct nir_builder *b, nir_instr *instr, void *data
b->cursor = nir_before_instr(instr);
unsigned align_mul = nir_intrinsic_align_mul(intrin);
unsigned align_offset = nir_intrinsic_align_offset(intrin);
if (intrin->intrinsic == nir_intrinsic_load_stack) {
nir_def *components[NIR_MAX_VEC_COMPONENTS] = {
0,
};
for (unsigned c = 0; c < intrin->def.num_components; c++) {
unsigned offset = c * intrin->def.bit_size / 8;
components[c] = nir_load_stack(b, 1, intrin->def.bit_size,
.base = nir_intrinsic_base(intrin) +
c * intrin->def.bit_size / 8,
.base = nir_intrinsic_base(intrin) + offset,
.call_idx = nir_intrinsic_call_idx(intrin),
.value_id = nir_intrinsic_value_id(intrin),
.align_mul = nir_intrinsic_align_mul(intrin));
.align_mul = align_mul,
.align_offset = (align_offset + offset) % align_mul);
}
nir_def_rewrite_uses(&intrin->def,
@@ -1882,11 +1888,12 @@ split_stack_components_instr(struct nir_builder *b, nir_instr *instr, void *data
} else {
assert(intrin->intrinsic == nir_intrinsic_store_stack);
for (unsigned c = 0; c < intrin->src[0].ssa->num_components; c++) {
unsigned offset = c * intrin->src[0].ssa->bit_size / 8;
nir_store_stack(b, nir_channel(b, intrin->src[0].ssa, c),
.base = nir_intrinsic_base(intrin) +
c * intrin->src[0].ssa->bit_size / 8,
.base = nir_intrinsic_base(intrin) + offset,
.call_idx = nir_intrinsic_call_idx(intrin),
.align_mul = nir_intrinsic_align_mul(intrin),
.align_mul = align_mul,
.align_offset = (align_offset + offset) % align_mul,
.value_id = nir_intrinsic_value_id(intrin),
.write_mask = 0x1);
}