From 7fa0f52d9680342179a6d0a34bbcb80a9d1f2907 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 16 Mar 2012 12:30:58 -0400 Subject: r600g: Clean up evergreen_create_compute_state() Remove some commented code and turn off binary dumping of shaders --- src/gallium/drivers/r600/evergreen_compute.c | 64 +++------------------------- 1 file changed, 5 insertions(+), 59 deletions(-) diff --git a/src/gallium/drivers/r600/evergreen_compute.c b/src/gallium/drivers/r600/evergreen_compute.c index 0fbcc5a74f9..58d9b3c6b17 100644 --- a/src/gallium/drivers/r600/evergreen_compute.c +++ b/src/gallium/drivers/r600/evergreen_compute.c @@ -157,65 +157,12 @@ void *evergreen_create_compute_state(struct pipe_context *ctx_, const const stru { struct r600_context *ctx = (struct r600_context *)ctx_; - static int dump_shaders = -1; - if (!ctx->screen->screen.get_param(&ctx->screen->screen, PIPE_CAP_COMPUTE)) { fprintf(stderr, "Compute is not supported\n"); return NULL; } - struct r600_pipe_compute *shader = CALLOC_STRUCT(r600_pipe_compute); -// int r; - -// shader->tokens = tgsi_dup_tokens(cso->tokens); - - if (dump_shaders == -1) - { -// dump_shaders = debug_get_bool_option("R600_DUMP_SHADERS", FALSE); - } - -// if (dump_shaders) - { -// tgsi_dump(shader->tokens, 0); - } - - -/* { - const struct tgsi_token *tokens = cso->tokens; - struct tgsi_llvm_context tg_ll_ctx; - LLVMModuleRef mod; - - radeon_setup_tgsi_llvm(&tg_ll_ctx); - tg_ll_ctx.userdata = NULL; - tg_ll_ctx.load_input = llvm_load_input; - tg_ll_ctx.fetch_constant = llvm_fetch_const; - tg_ll_ctx.emit_prologue = llvm_emit_prologue; - tg_ll_ctx.emit_epilogue = llvm_emit_epilogue; - - mod = tgsi_llvm(&tg_ll_ctx, tokens); - LLVMDumpModule(mod); - - char * gpu_family = "cypress"; - unsigned dump = 1; - unsigned char * inst_bytes = NULL; - unsigned inst_byte_count = 0; - - int ret = radeon_llvm_compile(mod, &inst_bytes, &inst_byte_count, - gpu_family, dump); - - printf("size: %i ret: %i\n", inst_byte_count, ret); - FILE *f = fopen("ki.bin", "w"); - fwrite(inst_bytes, 1, inst_byte_count, f); - fclose(f); - tgsi_llvm_dispose(&tg_ll_ctx); - }*/ -// r = r600_pipe_shader_create(ctx, shader); - -/* if (r) - { - return NULL; - }*/ shader->ctx = (struct r600_context*)ctx; shader->resources = (struct evergreen_compute_resource*)calloc(sizeof(struct evergreen_compute_resource), get_compute_resource_num()); @@ -226,22 +173,21 @@ void *evergreen_create_compute_state(struct pipe_context *ctx_, const const stru #if 1 - shader->mod = llvm_parse_bitcode(cso->shader.ir, cso->shader.ir_len); - r600_compute_shader_create(ctx_, shader->mod, &shader->bc); - -// r600_bytecode_dump(&shader->bc); - + shader->mod = llvm_parse_bitcode(cso->shader.ir, cso->shader.ir_len); + r600_compute_shader_create(ctx_, shader->mod, &shader->bc); + +#if 0 FILE *f = fopen("dump.bin", "w"); fwrite(shader->bc.bytecode, 4, shader->bc.ndw, f); fclose(f); +#endif #else shader->bc.bytecode = malloc(1024); memcpy(shader->bc.bytecode, shader_shader_binary, sizeof(shader_shader_binary)), - shader->bc.ndw = sizeof(shader_shader_binary)/4; shader->bc.ngpr = 8; -- cgit v1.2.3