[Mesa-dev] [PATCH 8/8] r600/radeonsi: enable glsl/tgsi on-disk cache

[Roland Scheidegger]

FWIW I'm seeing a build failure with llvm 3.3 (in a autotools build):

../../../../../src/gallium/drivers/radeon/r600_pipe_common.c:47:34:
fatal error: llvm-c/TargetMachine.h: No such file or directory

Not sure why though, the file would certainly exist...

Roland


Am 22.02.2017 um 04:45 schrieb Timothy Arceri:
> For gpu generations that use LLVM we create a timestamp string
> containing both the LLVM and Mesa build times, otherwise we just
> use the Mesa build time.
> 
> Reviewed-by: Marek Olšák <marek.olsak at amd.com>
> Reviewed-by: Edward O'Callaghan <funfunctor at folklore1984.net>
> ---
>  src/gallium/drivers/radeon/r600_pipe_common.c | 43 +++++++++++++++++++++++++++
>  src/gallium/drivers/radeon/r600_pipe_common.h |  3 ++
>  2 files changed, 46 insertions(+)
> 
> diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
> index 1781584..bae6d6f 100644
> --- a/src/gallium/drivers/radeon/r600_pipe_common.c
> +++ b/src/gallium/drivers/radeon/r600_pipe_common.c
> @@ -43,6 +43,10 @@
>  #define HAVE_LLVM 0
>  #endif
>  
> +#if HAVE_LLVM
> +#include <llvm-c/TargetMachine.h>
> +#endif
> +
>  #ifndef MESA_LLVM_VERSION_PATCH
>  #define MESA_LLVM_VERSION_PATCH 0
>  #endif
> @@ -779,6 +783,41 @@ static const char* r600_get_chip_name(struct r600_common_screen *rscreen)
>  	}
>  }
>  
> +static void r600_disk_cache_create(struct r600_common_screen *rscreen)
> +{
> +	uint32_t mesa_timestamp;
> +	if (disk_cache_get_function_timestamp(r600_disk_cache_create,
> +					      &mesa_timestamp)) {
> +		char *timestamp_str;
> +		int res = -1;
> +		if (rscreen->chip_class < SI) {
> +			res = asprintf(&timestamp_str, "%u",mesa_timestamp);
> +		}
> +#if HAVE_LLVM
> +		else {
> +			uint32_t llvm_timestamp;
> +			if (disk_cache_get_function_timestamp(LLVMInitializeAMDGPUTargetInfo,
> +							      &llvm_timestamp)) {
> +				res = asprintf(&timestamp_str, "%u_%u",
> +					       mesa_timestamp, llvm_timestamp);
> +			}
> +		}
> +#endif
> +		if (res != -1) {
> +			rscreen->disk_shader_cache =
> +				disk_cache_create(r600_get_chip_name(rscreen),
> +						  timestamp_str);
> +			free(timestamp_str);
> +		}
> +	}
> +}
> +
> +static struct disk_cache *r600_get_disk_shader_cache(struct pipe_screen *pscreen)
> +{
> +	struct r600_common_screen *rscreen = (struct r600_common_screen*)pscreen;
> +	return rscreen->disk_shader_cache;
> +}
> +
>  static const char* r600_get_name(struct pipe_screen* pscreen)
>  {
>  	struct r600_common_screen *rscreen = (struct r600_common_screen*)pscreen;
> @@ -1234,6 +1273,7 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen,
>  	rscreen->b.get_name = r600_get_name;
>  	rscreen->b.get_vendor = r600_get_vendor;
>  	rscreen->b.get_device_vendor = r600_get_device_vendor;
> +	rscreen->b.get_disk_shader_cache = r600_get_disk_shader_cache;
>  	rscreen->b.get_compute_param = r600_get_compute_param;
>  	rscreen->b.get_paramf = r600_get_paramf;
>  	rscreen->b.get_timestamp = r600_get_timestamp;
> @@ -1259,6 +1299,8 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen,
>  	rscreen->chip_class = rscreen->info.chip_class;
>  	rscreen->debug_flags = debug_get_flags_option("R600_DEBUG", common_debug_options, 0);
>  
> +	r600_disk_cache_create(rscreen);
> +
>  	slab_create_parent(&rscreen->pool_transfers, sizeof(struct r600_transfer), 64);
>  
>  	rscreen->force_aniso = MIN2(16, debug_get_num_option("R600_TEX_ANISO", -1));
> @@ -1324,6 +1366,7 @@ void r600_destroy_common_screen(struct r600_common_screen *rscreen)
>  
>  	slab_destroy_parent(&rscreen->pool_transfers);
>  
> +	disk_cache_destroy(rscreen->disk_shader_cache);
>  	rscreen->ws->destroy(rscreen->ws);
>  	FREE(rscreen);
>  }
> diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
> index a977dc1..94cf0fc 100644
> --- a/src/gallium/drivers/radeon/r600_pipe_common.h
> +++ b/src/gallium/drivers/radeon/r600_pipe_common.h
> @@ -36,6 +36,7 @@
>  
>  #include "radeon/radeon_winsys.h"
>  
> +#include "util/disk_cache.h"
>  #include "util/u_blitter.h"
>  #include "util/list.h"
>  #include "util/u_range.h"
> @@ -405,6 +406,8 @@ struct r600_common_screen {
>  	bool				has_cp_dma;
>  	bool				has_streamout;
>  
> +	struct disk_cache		*disk_shader_cache;
> +
>  	struct slab_parent_pool		pool_transfers;
>  
>  	/* Texture filter settings. */
>