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

util/disk_cache: add a new helper to create a disk cache

Browse source 
This will be used by RADV to store the meta shaders to a separate
cache directory.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33405>
This commit is contained in:
Samuel Pitoiset 2025-02-03 17:13:24 +01:00 • committed by Marge Bot
parent 03c3250e04
commit 30e0d3da66
4 changed files with 93 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

122
src/util/disk_cache.c
View file

@ -95,13 +95,13 @@ disk_cache_init_queue(struct disk_cache *cache)
static struct disk_cache *
disk_cache_type_create(const char *gpu_name,
const char *driver_id,
const char *cache_dir_name,
uint64_t driver_flags,
enum disk_cache_type cache_type)
enum disk_cache_type cache_type,
uint64_t max_size)
{
void *local;
struct disk_cache *cache = NULL;
char *max_size_str;
uint64_t max_size;
uint8_t cache_version = CACHE_VERSION;
size_t cv_size = sizeof(cache_version);
@ -123,7 +123,7 @@ disk_cache_type_create(const char *gpu_name,
goto path_fail;
char *path = disk_cache_generate_cache_dir(local, gpu_name, driver_id,
cache_type);
cache_dir_name, cache_type);
if (!path)
goto path_fail;
@ -157,54 +157,6 @@ disk_cache_type_create(const char *gpu_name,
if (!disk_cache_mmap_cache_index(local, cache, path))
goto path_fail;
max_size = 0;
max_size_str = getenv("MESA_SHADER_CACHE_MAX_SIZE");
if (!max_size_str) {
max_size_str = getenv("MESA_GLSL_CACHE_MAX_SIZE");
if (max_size_str)
fprintf(stderr,
"*** MESA_GLSL_CACHE_MAX_SIZE is deprecated; "
"use MESA_SHADER_CACHE_MAX_SIZE instead ***\n");
}
#ifdef MESA_SHADER_CACHE_MAX_SIZE
if( !max_size_str ) {
max_size_str = MESA_SHADER_CACHE_MAX_SIZE;
}
#endif
if (max_size_str) {
char *end;
max_size = strtoul(max_size_str, &end, 10);
if (end == max_size_str) {
max_size = 0;
} else {
switch (*end) {
case 'K':
case 'k':
max_size *= 1024;
break;
case 'M':
case 'm':
max_size *= 1024*1024;
break;
case '\0':
case 'G':
case 'g':
default:
max_size *= 1024*1024*1024;
break;
}
}
}
/* Default to 1GB for maximum cache size. */
if (max_size == 0) {
max_size = 1024*1024*1024;
}
cache->max_size = max_size;
if (cache->type == DISK_CACHE_DATABASE)
@ -268,6 +220,8 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
{
enum disk_cache_type cache_type;
struct disk_cache *cache;
uint64_t max_size = 0;
char *max_size_str;
if (debug_get_bool_option("MESA_DISK_CACHE_SINGLE_FILE", false))
cache_type = DISK_CACHE_SINGLE_FILE;
@ -282,9 +236,55 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
disk_cache_delete_old_cache();
}
max_size_str = getenv("MESA_SHADER_CACHE_MAX_SIZE");
if (!max_size_str) {
max_size_str = getenv("MESA_GLSL_CACHE_MAX_SIZE");
if (max_size_str)
fprintf(stderr,
"*** MESA_GLSL_CACHE_MAX_SIZE is deprecated; "
"use MESA_SHADER_CACHE_MAX_SIZE instead ***\n");
}
#ifdef MESA_SHADER_CACHE_MAX_SIZE
if (!max_size_str) {
max_size_str = MESA_SHADER_CACHE_MAX_SIZE;
}
#endif
if (max_size_str) {
char *end;
max_size = strtoul(max_size_str, &end, 10);
if (end == max_size_str) {
max_size = 0;
} else {
switch (*end) {
case 'K':
case 'k':
max_size *= 1024;
break;
case 'M':
case 'm':
max_size *= 1024*1024;
break;
case '\0':
case 'G':
case 'g':
default:
max_size *= 1024*1024*1024;
break;
}
}
}
/* Default to 1GB for maximum cache size. */
if (max_size == 0) {
max_size = 1024*1024*1024;
}
/* Create main writable cache. */
cache = disk_cache_type_create(gpu_name, driver_id, driver_flags,
cache_type);
cache = disk_cache_type_create(gpu_name, driver_id, NULL, driver_flags,
cache_type, max_size);
if (!cache)
return NULL;
@ -300,14 +300,24 @@ disk_cache_create(const char *gpu_name, const char *driver_id,
* If cache entry will be found in this cache, then the main cache
* will be bypassed.
*/
cache->foz_ro_cache = disk_cache_type_create(gpu_name, driver_id,
cache->foz_ro_cache = disk_cache_type_create(gpu_name, driver_id, NULL,
driver_flags,
DISK_CACHE_SINGLE_FILE);
DISK_CACHE_SINGLE_FILE,
max_size);
}
return cache;
}
struct disk_cache *
disk_cache_create_custom(const char *gpu_name, const char *driver_id,
uint64_t driver_flags, const char *cache_dir_name,
uint32_t max_size)
{
return disk_cache_type_create(gpu_name, driver_id, cache_dir_name, 0,
DISK_CACHE_DATABASE, max_size);
}
void
disk_cache_destroy(struct disk_cache *cache)
{

13
src/util/disk_cache.h
View file

@ -165,6 +165,11 @@ struct disk_cache *
disk_cache_create(const char *gpu_name, const char *timestamp,
uint64_t driver_flags);
struct disk_cache *
disk_cache_create_custom(const char *gpu_name, const char *driver_id,
uint64_t driver_flags, const char *cache_dir_name,
uint32_t max_size);
/**
* Destroy a cache object, (freeing all associated resources).
*/
@ -274,6 +279,14 @@ disk_cache_create(const char *gpu_name, const char *timestamp,
return NULL;
}
static inline struct disk_cache *
disk_cache_create_custom(const char *gpu_name, const char *driver_id,
uint64_t driver_flags, const char *cache_dir_name,
uint32_t max_size)
{
return NULL;
}
static inline void
disk_cache_destroy(struct disk_cache *cache)
{

19
src/util/disk_cache_os.c
View file

@ -881,13 +881,20 @@ disk_cache_write_item_to_disk(struct disk_cache_put_job *dc_job,
char *
disk_cache_generate_cache_dir(void *mem_ctx, const char *gpu_name,
const char *driver_id,
const char *cache_dir_name_custom,
enum disk_cache_type cache_type)
{
char *cache_dir_name = CACHE_DIR_NAME;
if (cache_type == DISK_CACHE_SINGLE_FILE)
cache_dir_name = CACHE_DIR_NAME_SF;
else if (cache_type == DISK_CACHE_DATABASE)
cache_dir_name = CACHE_DIR_NAME_DB;
char *cache_dir_name;
if (cache_dir_name_custom) {
cache_dir_name = (char *)cache_dir_name_custom;
} else {
cache_dir_name = CACHE_DIR_NAME;
if (cache_type == DISK_CACHE_SINGLE_FILE)
cache_dir_name = CACHE_DIR_NAME_SF;
else if (cache_type == DISK_CACHE_DATABASE)
cache_dir_name = CACHE_DIR_NAME_DB;
}
char *path = secure_getenv("MESA_SHADER_CACHE_DIR");
@ -1231,7 +1238,7 @@ void
disk_cache_delete_old_cache(void)
{
void *ctx = ralloc_context(NULL);
char *dirname = disk_cache_generate_cache_dir(ctx, NULL, NULL, DISK_CACHE_MULTI_FILE);
char *dirname = disk_cache_generate_cache_dir(ctx, NULL, NULL, NULL, DISK_CACHE_MULTI_FILE);
if (!dirname)
goto finish;

1
src/util/disk_cache_os.h
View file

@ -130,6 +130,7 @@ struct disk_cache_put_job {
char *
disk_cache_generate_cache_dir(void *mem_ctx, const char *gpu_name,
const char *driver_id,
const char *cache_dir_name_custom,
enum disk_cache_type cache_type);
void