Re: [Mesa-dev] [PATCH 1/2] radeonsi: count compilations in si_compile_llvm

2015-12-18 Thread Marek Olšák
Reviewed-by: Marek Olšák 

On Thu, Dec 17, 2015 at 11:01 PM, Nicolai Hähnle  wrote:
> From: Nicolai Hähnle 
>
> This changes the count slightly (because of si_generate_gs_copy_shader), but
> this is only relevant for the driver-specific num-compilations query. It sets
> the stage for the next commit.
> ---
>  src/gallium/drivers/radeonsi/si_shader.c| 2 ++
>  src/gallium/drivers/radeonsi/si_state_shaders.c | 1 -
>  2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/gallium/drivers/radeonsi/si_shader.c 
> b/src/gallium/drivers/radeonsi/si_shader.c
> index 4a67276..511ed88 100644
> --- a/src/gallium/drivers/radeonsi/si_shader.c
> +++ b/src/gallium/drivers/radeonsi/si_shader.c
> @@ -3885,6 +3885,8 @@ int si_compile_llvm(struct si_screen *sscreen, struct 
> si_shader *shader,
> shader->selector ? shader->selector->tokens : 
> NULL);
> bool dump_ir = dump_asm && !(sscreen->b.debug_flags & DBG_NO_IR);
>
> +   p_atomic_inc(>b.num_compilations);
> +
> r = radeon_llvm_compile(mod, >binary,
> r600_get_llvm_processor_name(sscreen->b.family), dump_ir, 
> dump_asm, tm);
> if (r)
> diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c 
> b/src/gallium/drivers/radeonsi/si_state_shaders.c
> index f0147ce..8700590 100644
> --- a/src/gallium/drivers/radeonsi/si_state_shaders.c
> +++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
> @@ -634,7 +634,6 @@ static int si_shader_select(struct pipe_context *ctx,
> sel->last_variant = shader;
> }
> state->current = shader;
> -   p_atomic_inc(>screen->b.num_compilations);
> pipe_mutex_unlock(sel->mutex);
> return 0;
>  }
> --
> 2.5.0
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH 1/2] radeonsi: count compilations in si_compile_llvm

2015-12-17 Thread Nicolai Hähnle
From: Nicolai Hähnle 

This changes the count slightly (because of si_generate_gs_copy_shader), but
this is only relevant for the driver-specific num-compilations query. It sets
the stage for the next commit.
---
 src/gallium/drivers/radeonsi/si_shader.c| 2 ++
 src/gallium/drivers/radeonsi/si_state_shaders.c | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_shader.c 
b/src/gallium/drivers/radeonsi/si_shader.c
index 4a67276..511ed88 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -3885,6 +3885,8 @@ int si_compile_llvm(struct si_screen *sscreen, struct 
si_shader *shader,
shader->selector ? shader->selector->tokens : 
NULL);
bool dump_ir = dump_asm && !(sscreen->b.debug_flags & DBG_NO_IR);
 
+   p_atomic_inc(>b.num_compilations);
+
r = radeon_llvm_compile(mod, >binary,
r600_get_llvm_processor_name(sscreen->b.family), dump_ir, 
dump_asm, tm);
if (r)
diff --git a/src/gallium/drivers/radeonsi/si_state_shaders.c 
b/src/gallium/drivers/radeonsi/si_state_shaders.c
index f0147ce..8700590 100644
--- a/src/gallium/drivers/radeonsi/si_state_shaders.c
+++ b/src/gallium/drivers/radeonsi/si_state_shaders.c
@@ -634,7 +634,6 @@ static int si_shader_select(struct pipe_context *ctx,
sel->last_variant = shader;
}
state->current = shader;
-   p_atomic_inc(>screen->b.num_compilations);
pipe_mutex_unlock(sel->mutex);
return 0;
 }
-- 
2.5.0

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev