agx: Add ld_tile opcode
Variant of st_tile. Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10720>
This commit is contained in:
@@ -172,6 +172,10 @@ op("device_load",
|
|||||||
op("wait", (0x38, 0xFF, 2, _), dests = 0,
|
op("wait", (0x38, 0xFF, 2, _), dests = 0,
|
||||||
can_eliminate = False, imms = [SCOREBOARD])
|
can_eliminate = False, imms = [SCOREBOARD])
|
||||||
|
|
||||||
|
# Essentially same encoding
|
||||||
|
op("ld_tile", (0x49, 0x7F, 8, _), dests = 1, srcs = 0,
|
||||||
|
can_eliminate = False, imms = [FORMAT])
|
||||||
|
|
||||||
op("st_tile", (0x09, 0x7F, 8, _), dests = 0, srcs = 1,
|
op("st_tile", (0x09, 0x7F, 8, _), dests = 0, srcs = 1,
|
||||||
can_eliminate = False, imms = [FORMAT])
|
can_eliminate = False, imms = [FORMAT])
|
||||||
|
|
||||||
|
@@ -356,18 +356,22 @@ static void
|
|||||||
agx_pack_instr(struct util_dynarray *emission, agx_instr *I)
|
agx_pack_instr(struct util_dynarray *emission, agx_instr *I)
|
||||||
{
|
{
|
||||||
switch (I->op) {
|
switch (I->op) {
|
||||||
|
case AGX_OPCODE_LD_TILE:
|
||||||
case AGX_OPCODE_ST_TILE:
|
case AGX_OPCODE_ST_TILE:
|
||||||
{
|
{
|
||||||
unsigned D = agx_pack_alu_dst(I->src[0]);
|
bool load = (I->op == AGX_OPCODE_LD_TILE);
|
||||||
|
unsigned D = agx_pack_alu_dst(load ? I->dest[0] : I->src[0]);
|
||||||
unsigned rt = 0; /* TODO */
|
unsigned rt = 0; /* TODO */
|
||||||
unsigned mask = I->mask ?: 0xF;
|
unsigned mask = I->mask ?: 0xF;
|
||||||
assert(mask < 0x10);
|
assert(mask < 0x10);
|
||||||
|
|
||||||
uint64_t raw =
|
uint64_t raw =
|
||||||
0x09 |
|
0x09 |
|
||||||
|
(load ? (1 << 6) : 0) |
|
||||||
((uint64_t) (D & BITFIELD_MASK(8)) << 7) |
|
((uint64_t) (D & BITFIELD_MASK(8)) << 7) |
|
||||||
((uint64_t) (I->format) << 24) |
|
((uint64_t) (I->format) << 24) |
|
||||||
((uint64_t) (rt) << 32) |
|
((uint64_t) (rt) << 32) |
|
||||||
|
(load ? (1ull << 35) : 0) |
|
||||||
((uint64_t) (mask) << 36) |
|
((uint64_t) (mask) << 36) |
|
||||||
((uint64_t) 0x0380FC << 40) |
|
((uint64_t) 0x0380FC << 40) |
|
||||||
(((uint64_t) (D >> 8)) << 60);
|
(((uint64_t) (D >> 8)) << 60);
|
||||||
|
@@ -90,7 +90,7 @@ agx_ra(agx_context *ctx)
|
|||||||
unsigned size = ins->dest[d].size == AGX_SIZE_32 ? 2 : 1;
|
unsigned size = ins->dest[d].size == AGX_SIZE_32 ? 2 : 1;
|
||||||
if (size == 2 && usage & 1) usage++;
|
if (size == 2 && usage & 1) usage++;
|
||||||
unsigned v = usage;
|
unsigned v = usage;
|
||||||
unsigned comps = (ins->op == AGX_OPCODE_LD_VARY || ins->op == AGX_OPCODE_DEVICE_LOAD || ins->op == AGX_OPCODE_TEXTURE_SAMPLE) ? 4 : 1; // todo systematic
|
unsigned comps = (ins->op == AGX_OPCODE_LD_VARY || ins->op == AGX_OPCODE_DEVICE_LOAD || ins->op == AGX_OPCODE_TEXTURE_SAMPLE || ins->op == AGX_OPCODE_LD_TILE) ? 4 : 1; // todo systematic
|
||||||
usage += comps * size;
|
usage += comps * size;
|
||||||
alloc[ins->dest[d].value] = v;
|
alloc[ins->dest[d].value] = v;
|
||||||
ins->dest[d] = agx_replace_index(ins->dest[d], agx_register(v, ins->dest[d].size));
|
ins->dest[d] = agx_replace_index(ins->dest[d], agx_register(v, ins->dest[d].size));
|
||||||
|
Reference in New Issue
Block a user