util: Change remaining uint32 cache ids to sha1

After discussion with Timothy Arceri. disk_cache_get_function_identifier
was using only the first byte of the sha1 build-id.  Replace
disk_cache_get_function_identifier with implementation from
radv_get_build_id.  Instead of writing a uint32_t it now writes to a
mesa_sha1.  All drivers using disk_cache_get_function_identifier are
updated accordingly.

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
Fixes: 83ea8dd99bb1 ("util: add disk_cache_get_function_identifier()")

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 8e43a3aab58620dfc756387c068dd8e8dd8a89d2..b2798c402f68ad5d77a0283b98f00d3ba0d46ef0 100644 (file)
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -50,24 +50,6 @@
 #include "util/debug.h"
 #include "util/mesa-sha1.h"
 
-static bool
-radv_get_build_id(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, &timestamp)) {
-               _mesa_sha1_update(ctx, &timestamp, sizeof(timestamp));
-       } else
-               return false;
-       return true;
-}
-
 static int
 radv_device_get_cache_uuid(enum radeon_family family, void *uuid)
 {
@@ -78,8 +60,8 @@ radv_device_get_cache_uuid(enum radeon_family family, void *uuid)
        memset(uuid, 0, VK_UUID_SIZE);
        _mesa_sha1_init(&ctx);
 
-       if (!radv_get_build_id(radv_device_get_cache_uuid, &ctx) ||
-           !radv_get_build_id(LLVMInitializeAMDGPUTargetInfo, &ctx))
+       if (!disk_cache_get_function_identifier(radv_device_get_cache_uuid, &ctx) ||
+           !disk_cache_get_function_identifier(LLVMInitializeAMDGPUTargetInfo, &ctx))
                return -1;
 
        _mesa_sha1_update(&ctx, &family, sizeof(family));

diff --git a/src/gallium/drivers/nouveau/nouveau_screen.c b/src/gallium/drivers/nouveau/nouveau_screen.c
index a6c1a2ee47f560149fc88f9a9c30e074fae5a380..e9fe04bddf7df52dbc3e54d6b6a07798b63d2700 100644 (file)
--- a/src/gallium/drivers/nouveau/nouveau_screen.c
+++ b/src/gallium/drivers/nouveau/nouveau_screen.c
@@ -148,20 +148,21 @@ nouveau_screen_bo_get_handle(struct pipe_screen *pscreen,
 static void
 nouveau_disk_cache_create(struct nouveau_screen *screen)
 {
-   uint32_t mesa_id;
-   char *mesa_id_str;
-   int res;
-
-   if (disk_cache_get_function_identifier(nouveau_disk_cache_create,
-                                          &mesa_id)) {
-      res = asprintf(&mesa_id_str, "%u", mesa_id);
-      if (res != -1) {
-         screen->disk_shader_cache =
-            disk_cache_create(nouveau_screen_get_name(&screen->base),
-                              mesa_id_str, 0);
-         free(mesa_id_str);
-      }
-   }
+   struct mesa_sha1 ctx;
+   unsigned char sha1[20];
+   char cache_id[20 * 2 + 1];
+
+   _mesa_sha1_init(&ctx);
+   if (!disk_cache_get_function_identifier(nouveau_disk_cache_create,
+                                           &ctx))
+      return;
+
+   _mesa_sha1_final(&ctx, sha1);
+   disk_cache_format_hex_id(cache_id, sha1, 20 * 2);
+
+   screen->disk_shader_cache =
+      disk_cache_create(nouveau_screen_get_name(&screen->base),
+                        cache_id, 0);
 }
 
 int

diff --git a/src/gallium/drivers/r600/r600_pipe_common.c b/src/gallium/drivers/r600/r600_pipe_common.c
index 6b581242a184fca64ff5a223372b469e197ef5ac..e7c645611d77246a6119bcf4ea87ee011caf6125 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe_common.c
+++ b/src/gallium/drivers/r600/r600_pipe_common.c
@@ -854,27 +854,28 @@ static void r600_disk_cache_create(struct r600_common_screen *rscreen)
        if (rscreen->debug_flags & DBG_ALL_SHADERS)
                return;
 
-       uint32_t mesa_id;
-       if (disk_cache_get_function_identifier(r600_disk_cache_create,
-                                              &mesa_id)) {
-               char *mesa_id_str;
-               int res = -1;
-
-               res = asprintf(&mesa_id_str, "%u", mesa_id);
-               if (res != -1) {
-                       /* These flags affect shader compilation. */
-                       uint64_t shader_debug_flags =
-                               rscreen->debug_flags &
-                               (DBG_FS_CORRECT_DERIVS_AFTER_KILL |
-                                DBG_UNSAFE_MATH);
-
-                       rscreen->disk_shader_cache =
-                               disk_cache_create(r600_get_family_name(rscreen),
-                                                 mesa_id_str,
-                                                 shader_debug_flags);
-                       free(mesa_id_str);
-               }
-       }
+       struct mesa_sha1 ctx;
+       unsigned char sha1[20];
+       char cache_id[20 * 2 + 1];
+
+       _mesa_sha1_init(&ctx);
+       if (!disk_cache_get_function_identifier(r600_disk_cache_create,
+                                               &ctx))
+               return;
+
+       _mesa_sha1_final(&ctx, sha1);
+       disk_cache_format_hex_id(cache_id, sha1, 20 * 2);
+
+       /* These flags affect shader compilation. */
+       uint64_t shader_debug_flags =
+               rscreen->debug_flags &
+               (DBG_FS_CORRECT_DERIVS_AFTER_KILL |
+                DBG_UNSAFE_MATH);
+
+       rscreen->disk_shader_cache =
+               disk_cache_create(r600_get_family_name(rscreen),
+                                 cache_id,
+                                 shader_debug_flags);
 }
 
 static struct disk_cache *r600_get_disk_shader_cache(struct pipe_screen *pscreen)

diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 7bc34498cf438183cbff993184a58449e4de49bd..6118b8076f14f7c0fae73c5c4b69938acef7a90a 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -793,39 +793,39 @@ static void si_disk_cache_create(struct si_screen *sscreen)
        if (sscreen->debug_flags & DBG_ALL_SHADERS)
                return;
 
-       uint32_t mesa_id;
-       if (disk_cache_get_function_identifier(si_disk_cache_create, &mesa_id)) {
-               char *driver_id_str;
-               int res = -1;
-               uint32_t llvm_id;
-               if (disk_cache_get_function_identifier(LLVMInitializeAMDGPUTargetInfo,
-                                                      &llvm_id)) {
-                       res = asprintf(&driver_id_str, "%u_%u", mesa_id, llvm_id);
-               }
+       struct mesa_sha1 ctx;
+       unsigned char sha1[20];
+       char cache_id[20 * 2 + 1];
 
-               if (res != -1) {
-                       /* These flags affect shader compilation. */
-                       #define ALL_FLAGS (DBG(FS_CORRECT_DERIVS_AFTER_KILL) | \
-                                          DBG(SI_SCHED) | \
-                                          DBG(GISEL) | \
-                                          DBG(UNSAFE_MATH) | \
-                                          DBG(NIR))
-                       uint64_t shader_debug_flags = sscreen->debug_flags &
-                                                     ALL_FLAGS;
-
-                       /* Add the high bits of 32-bit addresses, which affects
-                        * how 32-bit addresses are expanded to 64 bits.
-                        */
-                       STATIC_ASSERT(ALL_FLAGS <= UINT_MAX);
-                       shader_debug_flags |= (uint64_t)sscreen->info.address32_hi << 32;
-
-                       sscreen->disk_shader_cache =
-                               disk_cache_create(sscreen->info.name,
-                                                 driver_id_str,
-                                                 shader_debug_flags);
-                       free(driver_id_str);
-               }
-       }
+       _mesa_sha1_init(&ctx);
+
+       if (!disk_cache_get_function_identifier(si_disk_cache_create, &ctx) ||
+           !disk_cache_get_function_identifier(LLVMInitializeAMDGPUTargetInfo,
+                                               &ctx))
+               return;
+
+       _mesa_sha1_final(&ctx, sha1);
+       disk_cache_format_hex_id(cache_id, sha1, 20 * 2);
+
+       /* These flags affect shader compilation. */
+       #define ALL_FLAGS (DBG(FS_CORRECT_DERIVS_AFTER_KILL) |  \
+                          DBG(SI_SCHED) |                      \
+                          DBG(GISEL) |                         \
+                          DBG(UNSAFE_MATH) |                   \
+                          DBG(NIR))
+       uint64_t shader_debug_flags = sscreen->debug_flags &
+               ALL_FLAGS;
+
+       /* Add the high bits of 32-bit addresses, which affects
+        * how 32-bit addresses are expanded to 64 bits.
+        */
+       STATIC_ASSERT(ALL_FLAGS <= UINT_MAX);
+       shader_debug_flags |= (uint64_t)sscreen->info.address32_hi << 32;
+
+       sscreen->disk_shader_cache =
+               disk_cache_create(sscreen->info.name,
+                                 cache_id,
+                                 shader_debug_flags);
 }
 
 struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws,

diff --git a/src/util/disk_cache.h b/src/util/disk_cache.h
index 3129de8ec9d15444229b54e437af0bdd00957019..2a147cba615b986eb05c7b13df2d06d820e66489 100644 (file)
--- a/src/util/disk_cache.h
+++ b/src/util/disk_cache.h
@@ -33,6 +33,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <sys/stat.h>
+#include "util/mesa-sha1.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -115,18 +116,21 @@ disk_cache_get_function_timestamp(void *ptr, uint32_t* timestamp)
 }
 
 static inline bool
-disk_cache_get_function_identifier(void *ptr, uint32_t *id)
+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))) {
-      const uint8_t *id_sha1 = build_id_data(note);
-      assert(id_sha1);
-      *id = *id_sha1;
-      return true;
+      _mesa_sha1_update(ctx, build_id_data(note), build_id_length(note));
    } else
 #endif
-   return disk_cache_get_function_timestamp(ptr, id);
+   if (disk_cache_get_function_timestamp(ptr, &timestamp)) {
+      _mesa_sha1_update(ctx, &timestamp, sizeof(timestamp));
+   } else
+      return false;
+   return true;
 }
 #endif