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

agx: Model local loads/stores

Browse Source 
Aka shared memory or threadgroup memory.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21326>
This commit is contained in:
Alyssa Rosenzweig
2023-02-08 20:11:48 -05:00
committed by Marge Bot
parent 0d07d27173
commit 6b0ef2b462
4 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/asahi/compiler/agx_lower_uniform_sources.c
View File

@@ -30,6 +30,10 @@ should_lower(enum agx_opcode op, agx_index uniform, unsigned src_index)
case AGX_OPCODE_DEVICE_STORE:
case AGX_OPCODE_ATOMIC:
return src_index != 1 || high;
case AGX_OPCODE_LOCAL_LOAD:
return src_index != 0;
case AGX_OPCODE_LOCAL_STORE:
return src_index != 1;
case AGX_OPCODE_ZS_EMIT:
case AGX_OPCODE_ST_TILE:
case AGX_OPCODE_LD_TILE:

11
src/asahi/compiler/agx_opcodes.py
View File

@@ -267,12 +267,23 @@ op("device_load",
encoding_32 = (0x05, 0x7F, 6, 8),
srcs = 2, imms = [FORMAT, MASK, SHIFT, SCOREBOARD], can_reorder = False)
# sources are base (relative to workgroup memory), index
op("local_load",
encoding_32 = (0b1101001, 0, 6, 8),
srcs = 2, imms = [FORMAT, MASK])
# sources are value, base, index
# TODO: Consider permitting the short form
op("device_store",
encoding_32 = (0x45 | (1 << 47), 0, 8, _),
dests = 0, srcs = 3, imms = [FORMAT, MASK, SHIFT, SCOREBOARD], can_eliminate = False)
# sources are value, base, index
op("local_store",
encoding_32 = (0b0101001, 0, 6, 8),
dests = 0, srcs = 3, imms = [FORMAT, MASK],
can_eliminate=False)
# sources are value, index
# TODO: Consider permitting the short form
op("uniform_store",

5
src/asahi/compiler/agx_optimizer.c
View File

@@ -132,10 +132,13 @@ agx_optimizer_inline_imm(agx_instr **defs, agx_instr *I, unsigned srcs,
continue;
if (I->op == AGX_OPCODE_ZS_EMIT && s != 0)
continue;
if ((I->op == AGX_OPCODE_DEVICE_STORE || I->op == AGX_OPCODE_ATOMIC ||
if ((I->op == AGX_OPCODE_DEVICE_STORE ||
I->op == AGX_OPCODE_LOCAL_STORE || I->op == AGX_OPCODE_ATOMIC ||
I->op == AGX_OPCODE_LOCAL_ATOMIC) &&
s != 2)
continue;
if (I->op == AGX_OPCODE_LOCAL_LOAD && s != 1)
continue;
if (float_src) {
bool fp16 = (def->dest[0].size == AGX_SIZE_16);

2
src/asahi/compiler/agx_register_allocate.c
View File

@@ -58,6 +58,7 @@ agx_write_registers(agx_instr *I, unsigned d)
return 4 * size;
case AGX_OPCODE_DEVICE_LOAD:
case AGX_OPCODE_LOCAL_LOAD:
case AGX_OPCODE_LD_TILE:
return util_bitcount(I->mask) * size;
@@ -98,6 +99,7 @@ agx_read_registers(agx_instr *I, unsigned s)
return I->nr_dests * agx_size_align_16(agx_split_width(I));
case AGX_OPCODE_DEVICE_STORE:
case AGX_OPCODE_LOCAL_STORE:
case AGX_OPCODE_ST_TILE:
if (s == 0)
return util_bitcount(I->mask) * size;