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

freedreno/ir3: Add new synchronization opcodes 

There are two new opcodes in use in tesselation control shaders:
category 0, opcodes 13 and 15.  unk13 is a kill type of instruction
that terminates threads where !p0.x and it used to narrow down a patch
wavefront to just thread 0.  Then, once thread 0 has written the tess
levels, it issues unk15, which might signal the TE that another patch
has been fully written.

Signed-off-by: Kristian H. Kristensen <hoegsberg@google.com>
Acked-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Kristian H. Kristensen 2019-10-22 18:19:50 -07:00
parent 56ed835bff
commit 581cd59692
5 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/freedreno/ir3/disasm-a3xx.c
View File

@ -166,6 +166,7 @@ static void print_instr_cat0(struct disasm_ctx *ctx, instr_t *instr)
switch (cat0->opc) {
case OPC_KILL:
case OPC_CONDEND:
fprintf(ctx->out, " %sp0.%c", cat0->inv ? "!" : "",
component[cat0->comp]);
break;
@ -908,6 +909,8 @@ static const struct opc_info {
OPC(0, OPC_CHMASK, chmask),
OPC(0, OPC_CHSH, chsh),
OPC(0, OPC_FLOW_REV, flow_rev),
OPC(0, OPC_CONDEND, condend),
OPC(0, OPC_ENDPATCH, endpatch),
/* category 1: */
OPC(1, OPC_MOV, ),

3
src/freedreno/ir3/instr-a3xx.h
View File

@ -51,6 +51,9 @@ typedef enum {
OPC_CHSH = _OPC(0, 10),
OPC_FLOW_REV = _OPC(0, 11),
OPC_CONDEND = _OPC(0, 13),
OPC_ENDPATCH = _OPC(0, 15),
/* category 1: */
OPC_MOV = _OPC(1, 0),

3
src/freedreno/ir3/ir3.c
View File

@ -154,6 +154,9 @@ static int emit_cat0(struct ir3_instruction *instr, void *ptr,
cat0->sync = !!(instr->flags & IR3_INSTR_SY);
cat0->opc_cat = 0;
if (instr->opc == OPC_CONDEND || instr->opc == OPC_ENDPATCH)
cat0->dummy4 = 16;
return 0;
}

4
src/freedreno/ir3/ir3.h
View File

@ -614,7 +614,7 @@ static inline bool is_flow(struct ir3_instruction *instr)
static inline bool is_kill(struct ir3_instruction *instr)
{
return instr->opc == OPC_KILL;
return instr->opc == OPC_KILL || instr->opc == OPC_CONDEND;
}
static inline bool is_nop(struct ir3_instruction *instr)
@ -1309,6 +1309,8 @@ INSTR1(KILL)
INSTR0(END)
INSTR0(CHSH)
INSTR0(CHMASK)
INSTR1(CONDEND)
INSTR0(ENDPATCH)
/* cat2 instructions, most 2 src but some 1 src: */
INSTR2(ADD_F)

3
src/freedreno/ir3/ir3_legalize.c
View File

@ -136,6 +136,9 @@ legalize_block(struct ir3_legalize_ctx *ctx, struct ir3_block *block)
last_input_needs_ss = false;
}
if (last_n && opc_cat(last_n->opc) == 0 && opc_op(last_n->opc) == 13)
n->flags |= IR3_INSTR_SS;
/* NOTE: consider dst register too.. it could happen that
* texture sample instruction (for example) writes some
* components which are unused. A subsequent instruction