fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 20:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Panfrost: Fix un-split 64-bit address for store_scratch instruction

Browse source 
In Panfrost compute shader, store_scratch instructions with 64-bit const
address are generated by `nir_lower_vars_to_scratch`. This address didn't
pass `bi_emit_cached_split` before `bi_emit_store` and `bi_emit_load`,
which assumes the low and high parts of the 64-bit address are split.
A "missing bi_cache_collect()" abortion is then triggered at `bi_extract`.

This bug fix checks and splits 64-bit addresses in the `bi_emit_store` and
`bi_emit_load` instructions. Test on RK3588 with Mali-G610.

Reviewed-by: Eric R. Smith <eric.smith@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36969>
This commit is contained in:
Bohan Yu 2025-08-24 21:15:54 +08:00 • committed by Marge Bot
parent a790236a56
commit a037443399
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/panfrost/compiler/bifrost_compile.c
View file

@ -1430,11 +1430,27 @@ bi_emit_load_push_constant(bi_builder *b, nir_intrinsic_instr *instr)
MAX2((base / 4) + n, b->shader->info.push->count);
}
static bi_index
bi_addr_high(bi_builder *b, nir_src *src)
/* Split a 32/64-bit address into low and high parts. 64-bit addresses are
* checked to be split and cached. 64-bit address happens on `store_scratch`
* produced by `nir_lower_vars_to_scratch`
*/
static void
bi_addr_split(bi_builder *b, nir_src *src, bi_index *addr_lo, bi_index *addr_hi)
{
return (nir_src_bit_size(*src) == 64) ? bi_extract(b, bi_src_index(src), 1)
: bi_zero();
bi_index addr = bi_src_index(src);
if (nir_src_bit_size(*src) == 32) {
*addr_lo = addr;
*addr_hi = bi_zero();
return;
}
bi_index *components = _mesa_hash_table_u64_search(b->shader->allocated_vec,
bi_index_to_key(addr));
if (components == NULL) {
bi_emit_cached_split(b, addr, 64);
}
*addr_lo = bi_extract(b, addr, 0);
*addr_hi = bi_extract(b, addr, 1);
}
static void
@ -1474,8 +1490,8 @@ bi_emit_load(bi_builder *b, nir_intrinsic_instr *instr, enum bi_seg seg)
int16_t offset = 0;
unsigned bits = instr->num_components * instr->def.bit_size;
bi_index dest = bi_def_index(&instr->def);
bi_index addr_lo = bi_extract(b, bi_src_index(&instr->src[0]), 0);
bi_index addr_hi = bi_addr_high(b, &instr->src[0]);
bi_index addr_lo, addr_hi;
bi_addr_split(b, &instr->src[0], &addr_lo, &addr_hi);
bi_handle_segment(b, &addr_lo, &addr_hi, seg, &offset);
@ -1491,8 +1507,8 @@ bi_emit_store(bi_builder *b, nir_intrinsic_instr *instr, enum bi_seg seg)
BITFIELD_MASK(instr->num_components));
int16_t offset = 0;
bi_index addr_lo = bi_extract(b, bi_src_index(&instr->src[1]), 0);
bi_index addr_hi = bi_addr_high(b, &instr->src[1]);
bi_index addr_lo, addr_hi;
bi_addr_split(b, &instr->src[1], &addr_lo, &addr_hi);
bi_handle_segment(b, &addr_lo, &addr_hi, seg, &offset);