Commit 589337e5 authored by Alyssa Rosenzweig's avatar Alyssa Rosenzweig 💜

midgard: Fix early constant inline termination

parent 360eff69
...@@ -1017,7 +1017,6 @@ skip_instruction: ...@@ -1017,7 +1017,6 @@ skip_instruction:
if (entry) { \ if (entry) { \
attach_constants(alu, entry); \ attach_constants(alu, entry); \
alu->ssa_args.src = REGISTER_CONSTANT; \ alu->ssa_args.src = REGISTER_CONSTANT; \
break; \
} \ } \
} }
...@@ -1228,11 +1227,11 @@ midgard_compile_shader_nir(nir_shader *nir, struct util_dynarray *compiled) ...@@ -1228,11 +1227,11 @@ midgard_compile_shader_nir(nir_shader *nir, struct util_dynarray *compiled)
emit_instr(ctx, instr); emit_instr(ctx, instr);
} }
/* Workaround hardware quirk */
defer_stores(ctx); defer_stores(ctx);
inline_alu_constants(ctx);
/* Artefact of load_const, etc in the average case */ /* Artefact of load_const, etc in the average case */
inline_alu_constants(ctx);
eliminate_constant_mov(ctx); eliminate_constant_mov(ctx);
/* Perform heavylifting for aliasing */ /* Perform heavylifting for aliasing */
...@@ -1431,7 +1430,9 @@ int main(int argc, char **argv) ...@@ -1431,7 +1430,9 @@ int main(int argc, char **argv)
midgard_compile_shader_nir(nir, &compiled); midgard_compile_shader_nir(nir, &compiled);
finalise_to_disk("/dev/shm/vertex.bin", &compiled); finalise_to_disk("/dev/shm/vertex.bin", &compiled);
#if 0
nir = glsl_to_nir(prog, MESA_SHADER_FRAGMENT, &nir_options); nir = glsl_to_nir(prog, MESA_SHADER_FRAGMENT, &nir_options);
midgard_compile_shader_nir(nir, &compiled); midgard_compile_shader_nir(nir, &compiled);
finalise_to_disk("/dev/shm/fragment.bin", &compiled); finalise_to_disk("/dev/shm/fragment.bin", &compiled);
#endif
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment