freedreno/ir3: add no-copy-propagate fallback step
Most of the things the new compiler still has trouble with basically amount to cp stage removing too many copies. But without the cp stage, the shaders the new compiler produces are still better (perf and correctness) than the old compiler. So a simple thing to do until I have more time to work on it is first trying falling back to new compiler without cp, before finally falling back to old compiler. Signed-off-by: Rob Clark <robclark@freedesktop.org>
This commit is contained in:
parent
e387fdd235
commit
fd4884e929
|
@ -2552,7 +2552,8 @@ compile_dump(struct ir3_compile_context *ctx)
|
|||
|
||||
int
|
||||
ir3_compile_shader(struct ir3_shader_variant *so,
|
||||
const struct tgsi_token *tokens, struct ir3_shader_key key)
|
||||
const struct tgsi_token *tokens, struct ir3_shader_key key,
|
||||
bool cp)
|
||||
{
|
||||
struct ir3_compile_context ctx;
|
||||
struct ir3_block *block;
|
||||
|
@ -2631,7 +2632,8 @@ ir3_compile_shader(struct ir3_shader_variant *so,
|
|||
ir3_dump_instr_list(block->head);
|
||||
}
|
||||
|
||||
ir3_block_cp(block);
|
||||
if (cp)
|
||||
ir3_block_cp(block);
|
||||
|
||||
if (fd_mesa_debug & FD_DBG_OPTDUMP)
|
||||
compile_dump(&ctx);
|
||||
|
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
int ir3_compile_shader(struct ir3_shader_variant *so,
|
||||
const struct tgsi_token *tokens,
|
||||
struct ir3_shader_key key);
|
||||
struct ir3_shader_key key, bool cp);
|
||||
int ir3_compile_shader_old(struct ir3_shader_variant *so,
|
||||
const struct tgsi_token *tokens,
|
||||
struct ir3_shader_key key);
|
||||
|
|
|
@ -101,6 +101,17 @@ fixup_vp_regfootprint(struct ir3_shader_variant *v)
|
|||
}
|
||||
}
|
||||
|
||||
/* reset before attempting to compile again.. */
|
||||
static void reset_variant(struct ir3_shader_variant *v, const char *msg)
|
||||
{
|
||||
debug_error(msg);
|
||||
v->inputs_count = 0;
|
||||
v->outputs_count = 0;
|
||||
v->total_in = 0;
|
||||
v->has_samp = false;
|
||||
v->immediates_count = 0;
|
||||
}
|
||||
|
||||
static struct ir3_shader_variant *
|
||||
create_variant(struct ir3_shader *shader, struct ir3_shader_key key)
|
||||
{
|
||||
|
@ -122,15 +133,12 @@ create_variant(struct ir3_shader *shader, struct ir3_shader_key key)
|
|||
}
|
||||
|
||||
if (!(fd_mesa_debug & FD_DBG_NOOPT)) {
|
||||
ret = ir3_compile_shader(v, tokens, key);
|
||||
ret = ir3_compile_shader(v, tokens, key, true);
|
||||
if (ret) {
|
||||
debug_error("new compiler failed, trying fallback!");
|
||||
|
||||
v->inputs_count = 0;
|
||||
v->outputs_count = 0;
|
||||
v->total_in = 0;
|
||||
v->has_samp = false;
|
||||
v->immediates_count = 0;
|
||||
reset_variant(v, "new compiler failed, trying without copy propagation!");
|
||||
ret = ir3_compile_shader(v, tokens, key, false);
|
||||
if (ret)
|
||||
reset_variant(v, "new compiler failed, trying fallback!");
|
||||
}
|
||||
} else {
|
||||
ret = -1; /* force fallback to old compiler */
|
||||
|
|
Loading…
Reference in New Issue