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

radeonsi: move si_shader_dump call out of si_shader_binary_read

Browse source 
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
This commit is contained in:
Marek Olšák 2016-01-03 17:03:24 +01:00
parent f8b34fe093
commit c9c031f3d0
3 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gallium/drivers/radeonsi/si_compute.c
View file

@ -138,9 +138,11 @@ static void *si_create_compute_state(
* the shader code to the GPU.
*/
init_scratch_buffer(sctx, program);
si_shader_binary_read(sctx->screen, &program->shader.binary,
&program->shader.config, &sctx->b.debug,
TGSI_PROCESSOR_COMPUTE);
si_shader_binary_read(&program->shader.binary,
&program->shader.config);
si_shader_dump(sctx->screen, &program->shader.binary,
&program->shader.config, &sctx->b.debug,
TGSI_PROCESSOR_COMPUTE);
si_shader_binary_upload(sctx->screen, &program->shader);
#endif

21
src/gallium/drivers/radeonsi/si_shader.c
View file

@ -3872,11 +3872,11 @@ static void si_shader_dump_stats(struct si_screen *sscreen,
conf->lds_size, conf->scratch_bytes_per_wave);
}
static void si_shader_dump(struct si_screen *sscreen,
struct radeon_shader_binary *binary,
struct si_shader_config *conf,
struct pipe_debug_callback *debug,
unsigned processor)
void si_shader_dump(struct si_screen *sscreen,
struct radeon_shader_binary *binary,
struct si_shader_config *conf,
struct pipe_debug_callback *debug,
unsigned processor)
{
if (r600_can_dump_shader(&sscreen->b, processor))
if (!(sscreen->b.debug_flags & DBG_NO_ASM))
@ -3885,14 +3885,10 @@ static void si_shader_dump(struct si_screen *sscreen,
si_shader_dump_stats(sscreen, conf, binary->code_size, debug, processor);
}
void si_shader_binary_read(struct si_screen *sscreen,
struct radeon_shader_binary *binary,
struct si_shader_config *conf,
struct pipe_debug_callback *debug,
unsigned processor)
void si_shader_binary_read(struct radeon_shader_binary *binary,
struct si_shader_config *conf)
{
si_shader_binary_read_config(binary, conf, 0);
si_shader_dump(sscreen, binary, conf, debug, processor);
}
int si_compile_llvm(struct si_screen *sscreen,
@ -3921,7 +3917,8 @@ int si_compile_llvm(struct si_screen *sscreen,
return r;
}
si_shader_binary_read(sscreen, binary, conf, debug, processor);
si_shader_binary_read(binary, conf);
si_shader_dump(sscreen, binary, conf, debug, processor);
FREE(binary->config);
FREE(binary->global_symbol_offsets);

12
src/gallium/drivers/radeonsi/si_shader.h
View file

@ -344,11 +344,13 @@ void si_shader_destroy(struct si_shader *shader);
void si_shader_destroy_binary(struct radeon_shader_binary *binary);
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);
void si_shader_binary_read(struct si_screen *sscreen,
struct radeon_shader_binary *binary,
struct si_shader_config *conf,
struct pipe_debug_callback *debug,
unsigned processor);
void si_shader_binary_read(struct radeon_shader_binary *binary,
struct si_shader_config *conf);
void si_shader_dump(struct si_screen *sscreen,
struct radeon_shader_binary *binary,
struct si_shader_config *conf,
struct pipe_debug_callback *debug,
unsigned processor);
void si_shader_apply_scratch_relocs(struct si_context *sctx,
struct si_shader *shader,
uint64_t scratch_va);