diff options
| author | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-08-16 18:00:39 +0200 |
|---|---|---|
| committer | Christoph Bumiller <e0425955@student.tuwien.ac.at> | 2010-08-17 00:47:47 +0200 |
| commit | 62f933a6f617050a267079b27360eaae2d0e1a70 (patch) | |
| tree | a7897c1efe777740babff92409ba515085254ff4 /src/gallium/drivers/nv50/nv50_pc_optimize.c | |
| parent | 6c5c55723d32f8933ffb5fc6b5beb209eca84ca8 (diff) | |
nv50: generate JOINs for outermost IF clauses
Diffstat (limited to 'src/gallium/drivers/nv50/nv50_pc_optimize.c')
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_pc_optimize.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/gallium/drivers/nv50/nv50_pc_optimize.c b/src/gallium/drivers/nv50/nv50_pc_optimize.c index 5d575461ca..b35dd72841 100644 --- a/src/gallium/drivers/nv50/nv50_pc_optimize.c +++ b/src/gallium/drivers/nv50/nv50_pc_optimize.c @@ -80,7 +80,7 @@ inst_commutation_legal(struct nv_instruction *a, static INLINE boolean inst_cullable(struct nv_instruction *nvi) { - return (!(nvi->is_terminator || + return (!(nvi->is_terminator || nvi->is_join || nvi->target || nvi->fixed || nv_nvi_refcount(nvi))); @@ -95,7 +95,8 @@ nvi_isnop(struct nv_instruction *nvi) if (nvi->fixed || nvi->is_terminator || nvi->flags_src || - nvi->flags_def) + nvi->flags_def || + nvi->is_join) return FALSE; if (nvi->def[0]->join->reg.id < 0) @@ -934,7 +935,7 @@ nv_pass_flatten(struct nv_pass *ctx, struct nv_basic_block *b) if (bb_is_if_else_endif(b)) { - debug_printf("nv_pass_flatten: IF/ELSE/ENDIF construct at BB:%i\n", b->id); + debug_printf("pass_flatten: IF/ELSE/ENDIF construct at BB:%i\n", b->id); for (n0 = 0, nvi = b->out[0]->entry; nvi; nvi = nvi->next, ++n0) if (!nv50_nvi_can_predicate(nvi)) @@ -959,6 +960,15 @@ nv_pass_flatten(struct nv_pass *ctx, struct nv_basic_block *b) assert(b->exit && b->exit->opcode == NV_OP_BRA); nv_nvi_delete(b->exit); + + if (b->exit && b->exit->opcode == NV_OP_JOINAT) + nv_nvi_delete(b->exit); + + if ((nvi = b->out[0]->out[0]->entry)) { + nvi->is_join = 0; + if (nvi->opcode == NV_OP_JOIN) + nv_nvi_delete(nvi); + } } } DESCEND_ARBITRARY(i, nv_pass_flatten); |