From 8fcdb71d8c9e6a0d9d9b70550bb764b654377714 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Wed, 25 Jul 2018 14:31:05 -0700 Subject: [PATCH] intel/compiler: Add brw_get_compiler_config_value for disk cache During code review, Jason pointed out that: 2b3064c0731 "i965, anv: Use INTEL_DEBUG for disk_cache driver flags" Didn't account for INTEL_SCALER_* environment variables. To fix this, let the compiler return the disk_cache driver flags. Another possible fix would be to pull the INTEL_SCALER_* into INTEL_DEBUG bits, but as we are currently using 41 of 64 bits, I didn't think it was a good use of 4 more of these bits. (5 since INTEL_PRECISE_TRIG needs to be accounted for as well.) Cc: Jason Ekstrand Signed-off-by: Jordan Justen Reviewed-by: Kenneth Graunke --- src/intel/compiler/brw_compiler.c | 27 ++++++++++++++++++++++ src/intel/compiler/brw_compiler.h | 12 ++++++++++ src/intel/vulkan/anv_device.c | 3 ++- src/mesa/drivers/dri/i965/brw_disk_cache.c | 3 ++- 4 files changed, 43 insertions(+), 2 deletions(-) diff --git a/src/intel/compiler/brw_compiler.c b/src/intel/compiler/brw_compiler.c index 6480dbefbf6..6df9621fe42 100644 --- a/src/intel/compiler/brw_compiler.c +++ b/src/intel/compiler/brw_compiler.c @@ -181,6 +181,33 @@ brw_compiler_create(void *mem_ctx, const struct gen_device_info *devinfo) return compiler; } +static void +insert_u64_bit(uint64_t *val, bool add) +{ + *val = (*val << 1) | !!add; +} + +uint64_t +brw_get_compiler_config_value(const struct brw_compiler *compiler) +{ + uint64_t config = 0; + insert_u64_bit(&config, compiler->precise_trig); + if (compiler->devinfo->gen >= 8 && compiler->devinfo->gen < 10) { + insert_u64_bit(&config, compiler->scalar_stage[MESA_SHADER_VERTEX]); + insert_u64_bit(&config, compiler->scalar_stage[MESA_SHADER_TESS_CTRL]); + insert_u64_bit(&config, compiler->scalar_stage[MESA_SHADER_TESS_EVAL]); + insert_u64_bit(&config, compiler->scalar_stage[MESA_SHADER_GEOMETRY]); + } + uint64_t debug_bits = INTEL_DEBUG; + uint64_t mask = DEBUG_DISK_CACHE_MASK; + while (mask != 0) { + const uint64_t bit = 1ULL << (ffsll(mask) - 1); + insert_u64_bit(&config, (debug_bits & bit) != 0); + mask &= ~bit; + } + return config; +} + unsigned brw_prog_data_size(gl_shader_stage stage) { diff --git a/src/intel/compiler/brw_compiler.h b/src/intel/compiler/brw_compiler.h index 4797c9cf06d..c510d34ce2e 100644 --- a/src/intel/compiler/brw_compiler.h +++ b/src/intel/compiler/brw_compiler.h @@ -1214,6 +1214,18 @@ DEFINE_PROG_DATA_DOWNCAST(sf) struct brw_compiler * brw_compiler_create(void *mem_ctx, const struct gen_device_info *devinfo); +/** + * Returns a compiler configuration for use with disk shader cache + * + * This value only needs to change for settings that can cause different + * program generation between two runs on the same hardware. + * + * For example, it doesn't need to be different for gen 8 and gen 9 hardware, + * but it does need to be different if INTEL_DEBUG=nocompact is or isn't used. + */ +uint64_t +brw_get_compiler_config_value(const struct brw_compiler *compiler); + unsigned brw_prog_data_size(gl_shader_stage stage); diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 6b72a79a914..c40b94d69f3 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -286,7 +286,8 @@ anv_physical_device_init_disk_cache(struct anv_physical_device *device) char timestamp[41]; _mesa_sha1_format(timestamp, device->driver_build_sha1); - const uint64_t driver_flags = INTEL_DEBUG & DEBUG_DISK_CACHE_MASK; + const uint64_t driver_flags = + brw_get_compiler_config_value(device->compiler); device->disk_cache = disk_cache_create(renderer, timestamp, driver_flags); #else device->disk_cache = NULL; diff --git a/src/mesa/drivers/dri/i965/brw_disk_cache.c b/src/mesa/drivers/dri/i965/brw_disk_cache.c index 0797e6eac44..9a6f2ff570c 100644 --- a/src/mesa/drivers/dri/i965/brw_disk_cache.c +++ b/src/mesa/drivers/dri/i965/brw_disk_cache.c @@ -396,7 +396,8 @@ brw_disk_cache_init(struct intel_screen *screen) char timestamp[41]; _mesa_sha1_format(timestamp, id_sha1); - const uint64_t driver_flags = INTEL_DEBUG & DEBUG_DISK_CACHE_MASK; + const uint64_t driver_flags = + brw_get_compiler_config_value(screen->compiler); screen->disk_cache = disk_cache_create(renderer, timestamp, driver_flags); #endif } -- 2.30.2