X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=blobdiff_plain;f=src%2Futil%2Fdisk_cache.h;h=29fb37cea1100f1111fd706cf243288e0f286759;hp=e3663a65c51e75899ba1e13b2e06e3bc0f48cefe;hb=HEAD;hpb=529a767041c880f90c4465cb34a89430459c7fce diff --git a/src/util/disk_cache.h b/src/util/disk_cache.h index e3663a65c51..29fb37cea11 100644 --- a/src/util/disk_cache.h +++ b/src/util/disk_cache.h @@ -24,13 +24,16 @@ #ifndef DISK_CACHE_H #define DISK_CACHE_H -#ifdef ENABLE_SHADER_CACHE +#ifdef HAVE_DLFCN_H #include +#include +#include "util/build_id.h" #endif #include #include #include #include +#include "util/mesa-sha1.h" #ifdef __cplusplus extern "C" { @@ -39,31 +42,59 @@ extern "C" { /* Size of cache keys in bytes. */ #define CACHE_KEY_SIZE 20 +#define CACHE_DIR_NAME "mesa_shader_cache" + typedef uint8_t cache_key[CACHE_KEY_SIZE]; +/* WARNING: 3rd party applications might be reading the cache item metadata. + * Do not change these values without making the change widely known. + * Please contact Valve developers and make them aware of this change. + */ +#define CACHE_ITEM_TYPE_UNKNOWN 0x0 +#define CACHE_ITEM_TYPE_GLSL 0x1 + +typedef void +(*disk_cache_put_cb) (const void *key, signed long keySize, + const void *value, signed long valueSize); + +typedef signed long +(*disk_cache_get_cb) (const void *key, signed long keySize, + void *value, signed long valueSize); + +struct cache_item_metadata { + /** + * The cache item type. This could be used to identify a GLSL cache item, + * a certain type of IR (tgsi, nir, etc), or signal that it is the final + * binary form of the shader. + */ + uint32_t type; + + /** GLSL cache item metadata */ + cache_key *keys; /* sha1 list of shaders that make up the cache item */ + uint32_t num_keys; +}; + struct disk_cache; -static inline const char * -get_arch_bitness_str(void) +static inline char * +disk_cache_format_hex_id(char *buf, const uint8_t *hex_id, unsigned size) { - if (sizeof(void *) == 4) -#ifdef __ILP32__ - return "ilp-32"; -#else - return "32"; -#endif - if (sizeof(void *) == 8) - return "64"; + static const char hex_digits[] = "0123456789abcdef"; + unsigned i; + + for (i = 0; i < size; i += 2) { + buf[i] = hex_digits[hex_id[i >> 1] >> 4]; + buf[i + 1] = hex_digits[hex_id[i >> 1] & 0x0f]; + } + buf[i] = '\0'; - /* paranoia check which will be dropped by the optimiser */ - assert(!"unknown_arch"); - return "unknown_arch"; + return buf; } +#ifdef HAVE_DLADDR static inline bool disk_cache_get_function_timestamp(void *ptr, uint32_t* timestamp) { -#ifdef ENABLE_SHADER_CACHE Dl_info info; struct stat st; if (!dladdr(ptr, &info) || !info.dli_fname) { @@ -72,12 +103,42 @@ disk_cache_get_function_timestamp(void *ptr, uint32_t* timestamp) if (stat(info.dli_fname, &st)) { return false; } + + if (!st.st_mtime) { + fprintf(stderr, "Mesa: The provided filesystem timestamp for the cache " + "is bogus! Disabling On-disk cache.\n"); + return false; + } + *timestamp = st.st_mtime; + return true; +} + +static inline bool +disk_cache_get_function_identifier(void *ptr, struct mesa_sha1 *ctx) +{ + uint32_t timestamp; + +#ifdef HAVE_DL_ITERATE_PHDR + const struct build_id_note *note = NULL; + if ((note = build_id_find_nhdr_for_addr(ptr))) { + _mesa_sha1_update(ctx, build_id_data(note), build_id_length(note)); + } else +#endif + if (disk_cache_get_function_timestamp(ptr, ×tamp)) { + _mesa_sha1_update(ctx, ×tamp, sizeof(timestamp)); + } else + return false; + return true; +} #else +static inline bool +disk_cache_get_function_identifier(void *ptr, struct mesa_sha1 *ctx) +{ return false; -#endif } +#endif /* Provide inlined stub functions if the shader cache is disabled. */ @@ -110,7 +171,8 @@ disk_cache_get_function_timestamp(void *ptr, uint32_t* timestamp) * assistance in computing SHA-1 signatures. */ struct disk_cache * -disk_cache_create(const char *gpu_name, const char *timestamp); +disk_cache_create(const char *gpu_name, const char *timestamp, + uint64_t driver_flags); /** * Destroy a cache object, (freeing all associated resources). @@ -118,6 +180,12 @@ disk_cache_create(const char *gpu_name, const char *timestamp); void disk_cache_destroy(struct disk_cache *cache); +/* Wait for all previous disk_cache_put() calls to be processed (used for unit + * testing). + */ +void +disk_cache_wait_for_idle(struct disk_cache *cache); + /** * Remove the item in the cache under the name \key. */ @@ -135,7 +203,8 @@ disk_cache_remove(struct disk_cache *cache, const cache_key key); */ void disk_cache_put(struct disk_cache *cache, const cache_key key, - const void *data, size_t size); + const void *data, size_t size, + struct cache_item_metadata *cache_item_metadata); /** * Retrieve an item previously stored in the cache with the name . @@ -159,7 +228,7 @@ disk_cache_get(struct disk_cache *cache, const cache_key key, size_t *size); * Later this key can be checked with disk_cache_has_key(), (unless the key * has been evicted in the interim). * - * Any call to cache_record() may cause an existing, random key to be + * Any call to disk_cache_put_key() may cause an existing, random key to be * evicted from the cache. */ void @@ -185,10 +254,15 @@ void disk_cache_compute_key(struct disk_cache *cache, const void *data, size_t size, cache_key key); +void +disk_cache_set_callbacks(struct disk_cache *cache, disk_cache_put_cb put, + disk_cache_get_cb get); + #else static inline struct disk_cache * -disk_cache_create(const char *gpu_name, const char *timestamp) +disk_cache_create(const char *gpu_name, const char *timestamp, + uint64_t driver_flags) { return NULL; } @@ -200,7 +274,8 @@ disk_cache_destroy(struct disk_cache *cache) { static inline void disk_cache_put(struct disk_cache *cache, const cache_key key, - const void *data, size_t size) + const void *data, size_t size, + struct cache_item_metadata *cache_item_metadata) { return; } @@ -229,13 +304,20 @@ disk_cache_has_key(struct disk_cache *cache, const cache_key key) return false; } -void +static inline void disk_cache_compute_key(struct disk_cache *cache, const void *data, size_t size, const cache_key key) { return; } +static inline void +disk_cache_set_callbacks(struct disk_cache *cache, disk_cache_put_cb put, + disk_cache_get_cb get) +{ + return; +} + #endif /* ENABLE_SHADER_CACHE */ #ifdef __cplusplus