radeonsi: pass TGSI processor type to si_compile_llvm for dumping
authorMarek Olšák <marek.olsak@amd.com>
Sun, 27 Dec 2015 21:22:24 +0000 (22:22 +0100)
committerMarek Olšák <marek.olsak@amd.com>
Sun, 3 Jan 2016 21:41:16 +0000 (22:41 +0100)
the parameter will be used later

Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
src/gallium/drivers/radeonsi/si_compute.c
src/gallium/drivers/radeonsi/si_shader.c
src/gallium/drivers/radeonsi/si_shader.h

index 2565117581e9df846d5067267728a49eab7bb348..32e265e2a36d819083b079a3802af34da3265c2a 100644 (file)
@@ -123,7 +123,7 @@ static void *si_create_compute_state(
                        LLVMModuleRef mod = radeon_llvm_get_kernel_module(program->llvm_ctx, i,
                                                         code, header->num_bytes);
                        si_compile_llvm(sctx->screen, &program->kernels[i], sctx->tm,
-                                       mod, &sctx->b.debug);
+                                       mod, &sctx->b.debug, TGSI_PROCESSOR_COMPUTE);
                        LLVMDisposeModule(mod);
                }
        }
index b453d97fa7e5e0f17147404aa8d0229631a81e7c..c2e802e69f22ea8509397c553c3c1923fab16b04 100644 (file)
@@ -3921,7 +3921,7 @@ int si_shader_binary_read(struct si_screen *sscreen, struct si_shader *shader,
 
 int si_compile_llvm(struct si_screen *sscreen, struct si_shader *shader,
                    LLVMTargetMachineRef tm, LLVMModuleRef mod,
-                   struct pipe_debug_callback *debug)
+                   struct pipe_debug_callback *debug, unsigned processor)
 {
        int r = 0;
        bool dump_asm = r600_can_dump_shader(&sscreen->b,
@@ -4026,7 +4026,7 @@ static int si_generate_gs_copy_shader(struct si_screen *sscreen,
 
        r = si_compile_llvm(sscreen, si_shader_ctx->shader,
                            si_shader_ctx->tm, bld_base->base.gallivm->module,
-                           debug);
+                           debug, TGSI_PROCESSOR_GEOMETRY);
 
        radeon_llvm_dispose(&si_shader_ctx->radeon_bld);
 
@@ -4235,7 +4235,7 @@ int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
        radeon_llvm_finalize_module(&si_shader_ctx.radeon_bld);
 
        mod = bld_base->base.gallivm->module;
-       r = si_compile_llvm(sscreen, shader, tm, mod, debug);
+       r = si_compile_llvm(sscreen, shader, tm, mod, debug, si_shader_ctx.type);
        if (r) {
                fprintf(stderr, "LLVM failed to compile shader\n");
                goto out;
index 443900b26ee2756189b0be40f6a545495ff0c8d0..b50b43c23907a56e7198aedb03ccf4cdca97e6a5 100644 (file)
@@ -332,7 +332,7 @@ int si_shader_create(struct si_screen *sscreen, LLVMTargetMachineRef tm,
 void si_dump_shader_key(unsigned shader, union si_shader_key *key, FILE *f);
 int si_compile_llvm(struct si_screen *sscreen, struct si_shader *shader,
                    LLVMTargetMachineRef tm, LLVMModuleRef mod,
-                   struct pipe_debug_callback *debug);
+                   struct pipe_debug_callback *debug, unsigned processor);
 void si_shader_destroy(struct si_shader *shader);
 unsigned si_shader_io_get_unique_index(unsigned semantic_name, unsigned index);
 int si_shader_binary_upload(struct si_screen *sscreen, struct si_shader *shader);