i965: Initialize disk shader cache if MESA_GLSL_CACHE_DISABLE is false

(Apologies for the double negative.)

For now, the shader cache is disabled by default on i965 to allow us
to verify its stability.

In other words, to enable the shader cache on i965, set
MESA_GLSL_CACHE_DISABLE to false or 0. If the variable is unset, then
the shader cache will be disabled.

We use the build-id of i965_dri.so for the timestamp, and the pci
device id for the device name.

v2:
 * Simplify code by forcing link to include build id sha. (Matt)

v3:
 * Don't use a for loop with snprintf for bin to hex. (Matt)
 * Assume fixed length render and timestamp string to further simplify
   code.

Cc: Matt Turner <mattst88@gmail.com>
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jordan Justen
2017-02-25 02:30:06 -08:00
parent ccb700526f
commit 1a61a8b9a7
4 changed files with 32 additions and 1 deletions

View File

@@ -44,7 +44,7 @@ Note: some of the new features are only available with certain drivers.
</p>
<ul>
TBD
<li>Disk shader cache support for i965 when MESA_GLSL_CACHE_DISABLE environment variable is set to "0" or "false"</li>
</ul>
<h2>Bug fixes</h2>

View File

@@ -1037,6 +1037,8 @@ brwCreateContext(gl_api api,
vbo_use_buffer_objects(ctx);
vbo_always_unmap_buffers(ctx);
brw_disk_cache_init(brw);
return true;
}

View File

@@ -26,6 +26,8 @@
#include "compiler/glsl/shader_cache.h"
#include "compiler/nir/nir_serialize.h"
#include "main/mtypes.h"
#include "util/build_id.h"
#include "util/debug.h"
#include "util/disk_cache.h"
#include "util/macros.h"
#include "util/mesa-sha1.h"
@@ -413,3 +415,29 @@ brw_disk_cache_write_compute_program(struct brw_context *brw)
MESA_SHADER_COMPUTE);
}
}
void
brw_disk_cache_init(struct brw_context *brw)
{
#ifdef ENABLE_SHADER_CACHE
if (env_var_as_boolean("MESA_GLSL_CACHE_DISABLE", true))
return;
char renderer[10];
MAYBE_UNUSED int len = snprintf(renderer, sizeof(renderer), "i965_%04x",
brw->screen->deviceID);
assert(len == sizeof(renderer) - 1);
const struct build_id_note *note =
build_id_find_nhdr_for_addr(brw_disk_cache_init);
assert(note && build_id_length(note) == 20 /* sha1 */);
const uint8_t *id_sha1 = build_id_data(note);
assert(id_sha1);
char timestamp[41];
_mesa_sha1_format(timestamp, id_sha1);
brw->ctx.Cache = disk_cache_create(renderer, timestamp, 0);
#endif
}

View File

@@ -132,6 +132,7 @@ void gen8_write_pma_stall_bits(struct brw_context *brw,
uint32_t pma_stall_bits);
/* brw_disk_cache.c */
void brw_disk_cache_init(struct brw_context *brw);
bool brw_disk_cache_upload_program(struct brw_context *brw,
gl_shader_stage stage);
void brw_disk_cache_write_compute_program(struct brw_context *brw);