OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

agx: Handle <32-bit local memory access

Browse Source 
I don't know if this is possible to hit with GL, but it is with Vulkan. Fixes:

dEQP-VK.spirv_assembly.instruction.compute.workgroup_memory.*

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24635>
This commit is contained in:
Alyssa Rosenzweig
2023-08-10 17:09:14 -04:00
committed by Marge Bot
parent aeffd22c30
commit fd481d00d3
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/asahi/compiler/agx_compile.c
View File

@@ -717,6 +717,21 @@ agx_emit_atomic(agx_builder *b, agx_index dst, nir_intrinsic_instr *instr,
} }
} }
static enum agx_format
format_for_bitsize(unsigned bitsize)
{
switch (bitsize) {
case 8:
return AGX_FORMAT_I8;
case 16:
return AGX_FORMAT_I16;
case 32:
return AGX_FORMAT_I32;
default:
unreachable("should've been lowered");
}
}
static void static void
agx_emit_local_load(agx_builder *b, agx_index dst, nir_intrinsic_instr *instr) agx_emit_local_load(agx_builder *b, agx_index dst, nir_intrinsic_instr *instr)
{ {
@@ -724,9 +739,7 @@ agx_emit_local_load(agx_builder *b, agx_index dst, nir_intrinsic_instr *instr)
agx_index index = agx_zero(); /* TODO: optimize address arithmetic */ agx_index index = agx_zero(); /* TODO: optimize address arithmetic */
assert(base.size == AGX_SIZE_16); assert(base.size == AGX_SIZE_16);
assert(nir_dest_bit_size(instr->dest) == 32 && "todo"); enum agx_format format = format_for_bitsize(nir_dest_bit_size(instr->dest));
enum agx_format format = AGX_FORMAT_I32;
unsigned nr = nir_dest_num_components(instr->dest); unsigned nr = nir_dest_num_components(instr->dest);
unsigned mask = BITFIELD_MASK(nr); unsigned mask = BITFIELD_MASK(nr);
@@ -742,8 +755,7 @@ agx_emit_local_store(agx_builder *b, nir_intrinsic_instr *instr)
agx_index index = agx_zero(); /* TODO: optimize address arithmetic */ agx_index index = agx_zero(); /* TODO: optimize address arithmetic */
assert(base.size == AGX_SIZE_16); assert(base.size == AGX_SIZE_16);
assert(nir_src_bit_size(instr->src[0]) == 32 && "todo"); enum agx_format format = format_for_bitsize(nir_src_bit_size(instr->src[0]));
enum agx_format format = AGX_FORMAT_I32;
unsigned mask = BITFIELD_MASK( unsigned mask = BITFIELD_MASK(
nir_src_num_components(instr->src[0])); /* XXX: there's a write mask */ nir_src_num_components(instr->src[0])); /* XXX: there's a write mask */