From cc2c3504162f534199a822322e15fc91517ba285 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 21 Jun 2016 17:43:35 +0100 Subject: [PATCH] anv: use cache uuid based on the build timestamp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Do not rely on the git sha1: - its current truncated form makes it less unique - it does not attribute for local (Vulkand or otherwise) changes Use a timestamp produced at the time of build. It's perfectly unique, unless someone explicitly thinkers with their system clock. Even then chances of producing the exact same one are very small, if not zero. v2: Remove .tmp rule. Its not needed since we want for the header to be regenerated on each time we call make (Eric). v3: - Honour SOURCE_DATE_EPOCH, to make the build reproducible (Michel) - Replace the generated header with a define, to prevent needless builds on consecutive `make' and/or `make install' calls. (Dave) v4: - Keep the timestamp generation at make time. (Jason) v5: - Ensure that file is regenerated on incremental builds. Cc: Michel Dänzer Cc: Dave Airlie Cc: mesa-stable@lists.freedesktop.org Signed-off-by: Emil Velikov Reviewed-by: Jason Ekstrand (cherry picked from commit addb099ce83c9b9909966a5cd364b85cedef1ee1) --- configure.ac | 2 ++ src/intel/vulkan/Makefile.am | 10 +++++++++- src/intel/vulkan/anv_device.c | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index c492e158f76..3bba0e41f8c 100644 --- a/configure.ac +++ b/configure.ac @@ -2590,6 +2590,8 @@ AC_SUBST([XA_MINOR], $XA_MINOR) AC_SUBST([XA_TINY], $XA_TINY) AC_SUBST([XA_VERSION], "$XA_MAJOR.$XA_MINOR.$XA_TINY") +AC_SUBST([TIMESTAMP_CMD], '`test $(SOURCE_DATE_EPOCH) && echo $(SOURCE_DATE_EPOCH) || date +%s`') + AC_ARG_ENABLE(valgrind, [AS_HELP_STRING([--enable-valgrind], [Build mesa with valgrind support (default: auto)])], diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index 3294fa48179..b605c08ea4e 100644 --- a/src/intel/vulkan/Makefile.am +++ b/src/intel/vulkan/Makefile.am @@ -138,8 +138,16 @@ anv_entrypoints.c : anv_entrypoints_gen.py $(vulkan_include_HEADERS) $(AM_V_GEN)$(CPP) $(VULKAN_ENTRYPOINT_CPPFLAGS) $(top_srcdir)/include/vulkan/vulkan_intel.h |\ $(PYTHON2) $(srcdir)/anv_entrypoints_gen.py code > $@ +.PHONY: anv_timestamp.h + +anv_timestamp.h: + @echo "Updating anv_timestamp.h" + $(AM_V_GEN) echo "#define ANV_TIMESTAMP \"$(TIMESTAMP_CMD)\"" > $@ + +anv_device.$(OBJEXT): anv_timestamp.h + BUILT_SOURCES = $(VULKAN_GENERATED_FILES) -CLEANFILES = $(BUILT_SOURCES) dev_icd.json +CLEANFILES = $(BUILT_SOURCES) dev_icd.json anv_timestamp.h EXTRA_DIST = \ $(top_srcdir)/include/vulkan/vk_icd.h \ anv_entrypoints_gen.py \ diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index ea8e875ad1e..dd941b6afeb 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -28,7 +28,7 @@ #include #include "anv_private.h" -#include "git_sha1.h" +#include "anv_timestamp.h" #include "util/strtod.h" #include "util/debug.h" @@ -426,7 +426,7 @@ void anv_device_get_cache_uuid(void *uuid) { memset(uuid, 0, VK_UUID_SIZE); - snprintf(uuid, VK_UUID_SIZE, "anv-%s", MESA_GIT_SHA1 + 4); + snprintf(uuid, VK_UUID_SIZE, "anv-%s", ANV_TIMESTAMP); } void anv_GetPhysicalDeviceProperties(