fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

freedreno/ir3: remove old compiler

Browse source 
Now that piglit is no longer falling back to old compiler for any tests,
we can remove it.  Hurray \o/

Signed-off-by: Rob Clark <robclark@freedesktop.org>
This commit is contained in:
Rob Clark 2015-03-11 15:10:25 -04:00
parent feb858b788
commit d3fb949c03
7 changed files with 11 additions and 1575 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/drivers/freedreno/Makefile.sources
View file

@ -122,7 +122,6 @@ ir3_SOURCES := \
ir3/ir3.c \
ir3/ir3_compiler.c \
ir3/ir3_compiler.h \
ir3/ir3_compiler_old.c \
ir3/ir3_cp.c \
ir3/ir3_depth.c \
ir3/ir3_dump.c \

1
src/gallium/drivers/freedreno/freedreno_screen.c
View file

@ -67,7 +67,6 @@ static const struct debug_named_value debug_options[] = {
{"nobypass", FD_DBG_NOBYPASS, "Disable GMEM bypass"},
{"fraghalf", FD_DBG_FRAGHALF, "Use half-precision in fragment shader"},
{"nobin", FD_DBG_NOBIN, "Disable hw binning"},
{"noopt", FD_DBG_NOOPT , "Disable optimization passes in compiler"},
{"optmsgs", FD_DBG_OPTMSGS,"Enable optimizater debug messages"},
{"optdump", FD_DBG_OPTDUMP,"Dump shader DAG to .dot files"},
{"glsl120", FD_DBG_GLSL120,"Temporary flag to force GLSL 120 (rather than 130) on a3xx+"},

1
src/gallium/drivers/freedreno/freedreno_util.h
View file

@ -62,7 +62,6 @@ enum adreno_stencil_op fd_stencil_op(unsigned op);
#define FD_DBG_NOBYPASS 0x0040
#define FD_DBG_FRAGHALF 0x0080
#define FD_DBG_NOBIN 0x0100
#define FD_DBG_NOOPT 0x0200
#define FD_DBG_OPTMSGS 0x0400
#define FD_DBG_OPTDUMP 0x0800
#define FD_DBG_GLSL120 0x1000

24
src/gallium/drivers/freedreno/ir3/ir3_cmdline.c
View file

@ -355,27 +355,17 @@ int main(int argc, char **argv)
break;
}
if (!(fd_mesa_debug & FD_DBG_NOOPT)) {
/* with new compiler: */
info = "new compiler";
ret = ir3_compile_shader(&v, toks, key, true);
info = "compiler";
ret = ir3_compile_shader(&v, toks, key, true);
if (ret) {
reset_variant(&v, "new compiler failed, trying without copy propagation!");
info = "new compiler (no copy propagation)";
ret = ir3_compile_shader(&v, toks, key, false);
if (ret)
reset_variant(&v, "new compiler failed, trying fallback!\n");
}
if (ret) {
reset_variant(&v, "compiler failed, trying without copy propagation!");
info = "compiler (no copy propagation)";
ret = ir3_compile_shader(&v, toks, key, false);
}
if (ret) {
info = "old compiler";
ret = ir3_compile_shader_old(&v, toks, key);
}
if (ret) {
fprintf(stderr, "old compiler failed!\n");
fprintf(stderr, "compiler failed!\n");
return ret;
}
dump_info(&v, info);

3
src/gallium/drivers/freedreno/ir3/ir3_compiler.h
View file

@ -35,8 +35,5 @@
int ir3_compile_shader(struct ir3_shader_variant *so,
const struct tgsi_token *tokens,
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);
#endif /* FD3_COMPILER_H_ */

1539
src/gallium/drivers/freedreno/ir3/ir3_compiler_old.c
View file

File diff suppressed because it is too large Load diff

17
src/gallium/drivers/freedreno/ir3/ir3_shader.c
View file

@ -177,21 +177,12 @@ create_variant(struct ir3_shader *shader, struct ir3_shader_key key)
tgsi_dump(tokens, 0);
}
if (!(fd_mesa_debug & FD_DBG_NOOPT)) {
ret = ir3_compile_shader(v, tokens, key, true);
if (ret) {
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 */
ret = ir3_compile_shader(v, tokens, key, true);
if (ret) {
reset_variant(v, "new compiler failed, trying without copy propagation!");
ret = ir3_compile_shader(v, tokens, key, false);
}
if (ret)
ret = ir3_compile_shader_old(v, tokens, key);
if (ret) {
debug_error("compile failed!");
goto fail;