OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv/pipeline: Put actual pointers in anv_shader_bin

Browse Source 
While we can simply calculate offsets to get to things such as the
prog_data and the key, it's much more user-friendly if there are just
pointers.  Also, it's a bit more fool-proof.

While we're at it, we rework the pipeline cache API to use the
brw_stage_prog_data type directly.

Signed-off-by: Jason Ekstrand <jason@jlekstrand.net>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98012
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Reviewed-by: Timothy Arceri <timothy.arceri@collabora.com>
Cc: "13.0" <mesa-stable@lists.freedesktop.org>
This commit is contained in:
Jason Ekstrand
2016-11-01 16:03:12 -07:00
parent 4306c10a88
commit ff3185e3ba
5 changed files with 45 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/intel/vulkan/anv_blorp.c
View File

@@ -44,8 +44,7 @@ lookup_blorp_shader(struct blorp_context *blorp,
anv_shader_bin_unref(device, bin); anv_shader_bin_unref(device, bin);
*kernel_out = bin->kernel.offset; *kernel_out = bin->kernel.offset;
*(const struct brw_stage_prog_data **)prog_data_out = *(const struct brw_stage_prog_data **)prog_data_out = bin->prog_data;
anv_shader_bin_get_prog_data(bin);
return true; return true;
} }
@@ -79,8 +78,7 @@ upload_blorp_shader(struct blorp_context *blorp,
anv_shader_bin_unref(device, bin); anv_shader_bin_unref(device, bin);
*kernel_out = bin->kernel.offset; *kernel_out = bin->kernel.offset;
*(const struct brw_stage_prog_data **)prog_data_out = *(const struct brw_stage_prog_data **)prog_data_out = bin->prog_data;
anv_shader_bin_get_prog_data(bin);
} }
void void

2
src/intel/vulkan/anv_cmd_buffer.c
View File

@@ -658,7 +658,7 @@ anv_cmd_buffer_push_constants(struct anv_cmd_buffer *cmd_buffer,
struct anv_push_constants *data = struct anv_push_constants *data =
cmd_buffer->state.push_constants[stage]; cmd_buffer->state.push_constants[stage];
const struct brw_stage_prog_data *prog_data = const struct brw_stage_prog_data *prog_data =
anv_shader_bin_get_prog_data(cmd_buffer->state.pipeline->shaders[stage]); cmd_buffer->state.pipeline->shaders[stage]->prog_data;
/* If we don't actually have any push constants, bail. */ /* If we don't actually have any push constants, bail. */
if (data == NULL || prog_data == NULL || prog_data->nr_params == 0) if (data == NULL || prog_data == NULL || prog_data->nr_params == 0)

17
src/intel/vulkan/anv_pipeline.c
View File

@@ -388,7 +388,8 @@ anv_pipeline_upload_kernel(struct anv_pipeline *pipeline,
struct anv_pipeline_cache *cache, struct anv_pipeline_cache *cache,
const void *key_data, uint32_t key_size, const void *key_data, uint32_t key_size,
const void *kernel_data, uint32_t kernel_size, const void *kernel_data, uint32_t kernel_size,
const void *prog_data, uint32_t prog_data_size, const struct brw_stage_prog_data *prog_data,
uint32_t prog_data_size,
const struct anv_pipeline_bind_map *bind_map) const struct anv_pipeline_bind_map *bind_map)
{ {
if (cache) { if (cache) {
@@ -476,7 +477,8 @@ anv_pipeline_compile_vs(struct anv_pipeline *pipeline,
bin = anv_pipeline_upload_kernel(pipeline, cache, sha1, 20, bin = anv_pipeline_upload_kernel(pipeline, cache, sha1, 20,
shader_code, code_size, shader_code, code_size,
&prog_data, sizeof(prog_data), &map); &prog_data.base.base, sizeof(prog_data),
&map);
if (!bin) { if (!bin) {
ralloc_free(mem_ctx); ralloc_free(mem_ctx);
return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY); return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
@@ -486,7 +488,7 @@ anv_pipeline_compile_vs(struct anv_pipeline *pipeline,
} }
const struct brw_vs_prog_data *vs_prog_data = const struct brw_vs_prog_data *vs_prog_data =
(const struct brw_vs_prog_data *)anv_shader_bin_get_prog_data(bin); (const struct brw_vs_prog_data *)bin->prog_data;
if (vs_prog_data->base.dispatch_mode == DISPATCH_MODE_SIMD8) { if (vs_prog_data->base.dispatch_mode == DISPATCH_MODE_SIMD8) {
pipeline->vs_simd8 = bin->kernel.offset; pipeline->vs_simd8 = bin->kernel.offset;
@@ -563,7 +565,8 @@ anv_pipeline_compile_gs(struct anv_pipeline *pipeline,
/* TODO: SIMD8 GS */ /* TODO: SIMD8 GS */
bin = anv_pipeline_upload_kernel(pipeline, cache, sha1, 20, bin = anv_pipeline_upload_kernel(pipeline, cache, sha1, 20,
shader_code, code_size, shader_code, code_size,
&prog_data, sizeof(prog_data), &map); &prog_data.base.base, sizeof(prog_data),
&map);
if (!bin) { if (!bin) {
ralloc_free(mem_ctx); ralloc_free(mem_ctx);
return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY); return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
@@ -686,7 +689,8 @@ anv_pipeline_compile_fs(struct anv_pipeline *pipeline,
bin = anv_pipeline_upload_kernel(pipeline, cache, sha1, 20, bin = anv_pipeline_upload_kernel(pipeline, cache, sha1, 20,
shader_code, code_size, shader_code, code_size,
&prog_data, sizeof(prog_data), &map); &prog_data.base, sizeof(prog_data),
&map);
if (!bin) { if (!bin) {
ralloc_free(mem_ctx); ralloc_free(mem_ctx);
return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY); return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
@@ -758,7 +762,8 @@ anv_pipeline_compile_cs(struct anv_pipeline *pipeline,
bin = anv_pipeline_upload_kernel(pipeline, cache, sha1, 20, bin = anv_pipeline_upload_kernel(pipeline, cache, sha1, 20,
shader_code, code_size, shader_code, code_size,
&prog_data, sizeof(prog_data), &map); &prog_data.base, sizeof(prog_data),
&map);
if (!bin) { if (!bin) {
ralloc_free(mem_ctx); ralloc_free(mem_ctx);
return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY); return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);

42
src/intel/vulkan/anv_pipeline_cache.c
View File

@@ -26,11 +26,6 @@
#include "util/debug.h" #include "util/debug.h"
#include "anv_private.h" #include "anv_private.h"
struct shader_bin_key {
uint32_t size;
uint8_t data[0];
};
static size_t static size_t
anv_shader_bin_size(uint32_t prog_data_size, uint32_t key_size, anv_shader_bin_size(uint32_t prog_data_size, uint32_t key_size,
uint32_t surface_count, uint32_t sampler_count) uint32_t surface_count, uint32_t sampler_count)
@@ -44,20 +39,12 @@ anv_shader_bin_size(uint32_t prog_data_size, uint32_t key_size,
align_u32(binding_data_size, 8); align_u32(binding_data_size, 8);
} }
static inline const struct shader_bin_key *
anv_shader_bin_get_key(const struct anv_shader_bin *shader)
{
const void *data = shader;
data += align_u32(sizeof(struct anv_shader_bin), 8);
data += align_u32(shader->prog_data_size, 8);
return data;
}
struct anv_shader_bin * struct anv_shader_bin *
anv_shader_bin_create(struct anv_device *device, anv_shader_bin_create(struct anv_device *device,
const void *key_data, uint32_t key_size, const void *key_data, uint32_t key_size,
const void *kernel_data, uint32_t kernel_size, const void *kernel_data, uint32_t kernel_size,
const void *prog_data, uint32_t prog_data_size, const struct brw_stage_prog_data *prog_data,
uint32_t prog_data_size,
const struct anv_pipeline_bind_map *bind_map) const struct anv_pipeline_bind_map *bind_map)
{ {
const size_t size = const size_t size =
@@ -82,10 +69,12 @@ anv_shader_bin_create(struct anv_device *device,
void *data = shader; void *data = shader;
data += align_u32(sizeof(struct anv_shader_bin), 8); data += align_u32(sizeof(struct anv_shader_bin), 8);
shader->prog_data = data;
memcpy(data, prog_data, prog_data_size); memcpy(data, prog_data, prog_data_size);
data += align_u32(prog_data_size, 8); data += align_u32(prog_data_size, 8);
struct shader_bin_key *key = data; shader->key = data;
struct anv_shader_bin_key *key = data;
key->size = key_size; key->size = key_size;
memcpy(key->data, key_data, key_size); memcpy(key->data, key_data, key_size);
data += align_u32(sizeof(*key) + key_size, 8); data += align_u32(sizeof(*key) + key_size, 8);
@@ -115,7 +104,7 @@ static size_t
anv_shader_bin_data_size(const struct anv_shader_bin *shader) anv_shader_bin_data_size(const struct anv_shader_bin *shader)
{ {
return anv_shader_bin_size(shader->prog_data_size, return anv_shader_bin_size(shader->prog_data_size,
anv_shader_bin_get_key(shader)->size, shader->key->size,
shader->bind_map.surface_count, shader->bind_map.surface_count,
shader->bind_map.sampler_count) + shader->bind_map.sampler_count) +
align_u32(shader->kernel_size, 8); align_u32(shader->kernel_size, 8);
@@ -126,7 +115,7 @@ anv_shader_bin_write_data(const struct anv_shader_bin *shader, void *data)
{ {
size_t struct_size = size_t struct_size =
anv_shader_bin_size(shader->prog_data_size, anv_shader_bin_size(shader->prog_data_size,
anv_shader_bin_get_key(shader)->size, shader->key->size,
shader->bind_map.surface_count, shader->bind_map.surface_count,
shader->bind_map.sampler_count); shader->bind_map.sampler_count);
@@ -151,14 +140,14 @@ anv_shader_bin_write_data(const struct anv_shader_bin *shader, void *data)
static uint32_t static uint32_t
shader_bin_key_hash_func(const void *void_key) shader_bin_key_hash_func(const void *void_key)
{ {
const struct shader_bin_key *key = void_key; const struct anv_shader_bin_key *key = void_key;
return _mesa_hash_data(key->data, key->size); return _mesa_hash_data(key->data, key->size);
} }
static bool static bool
shader_bin_key_compare_func(const void *void_a, const void *void_b) shader_bin_key_compare_func(const void *void_a, const void *void_b)
{ {
const struct shader_bin_key *a = void_a, *b = void_b; const struct anv_shader_bin_key *a = void_a, *b = void_b;
if (a->size != b->size) if (a->size != b->size)
return false; return false;
@@ -230,7 +219,7 @@ anv_pipeline_cache_search_locked(struct anv_pipeline_cache *cache,
const void *key_data, uint32_t key_size) const void *key_data, uint32_t key_size)
{ {
uint32_t vla[1 + DIV_ROUND_UP(key_size, sizeof(uint32_t))]; uint32_t vla[1 + DIV_ROUND_UP(key_size, sizeof(uint32_t))];
struct shader_bin_key *key = (void *)vla; struct anv_shader_bin_key *key = (void *)vla;
key->size = key_size; key->size = key_size;
memcpy(key->data, key_data, key_size); memcpy(key->data, key_data, key_size);
@@ -281,7 +270,7 @@ anv_pipeline_cache_add_shader(struct anv_pipeline_cache *cache,
if (!bin) if (!bin)
return NULL; return NULL;
_mesa_hash_table_insert(cache->cache, anv_shader_bin_get_key(bin), bin); _mesa_hash_table_insert(cache->cache, bin->key, bin);
return bin; return bin;
} }
@@ -290,7 +279,8 @@ struct anv_shader_bin *
anv_pipeline_cache_upload_kernel(struct anv_pipeline_cache *cache, anv_pipeline_cache_upload_kernel(struct anv_pipeline_cache *cache,
const void *key_data, uint32_t key_size, const void *key_data, uint32_t key_size,
const void *kernel_data, uint32_t kernel_size, const void *kernel_data, uint32_t kernel_size,
const void *prog_data, uint32_t prog_data_size, const struct brw_stage_prog_data *prog_data,
uint32_t prog_data_size,
const struct anv_pipeline_bind_map *bind_map) const struct anv_pipeline_bind_map *bind_map)
{ {
if (cache->cache) { if (cache->cache) {
@@ -369,7 +359,7 @@ anv_pipeline_cache_load(struct anv_pipeline_cache *cache,
const void *prog_data = p; const void *prog_data = p;
p += align_u32(bin.prog_data_size, 8); p += align_u32(bin.prog_data_size, 8);
struct shader_bin_key key; struct anv_shader_bin_key key;
if (p + sizeof(key) > end) if (p + sizeof(key) > end)
break; break;
memcpy(&key, p, sizeof(key)); memcpy(&key, p, sizeof(key));
@@ -532,11 +522,11 @@ VkResult anv_MergePipelineCaches(
struct hash_entry *entry; struct hash_entry *entry;
hash_table_foreach(src->cache, entry) { hash_table_foreach(src->cache, entry) {
struct anv_shader_bin *bin = entry->data; struct anv_shader_bin *bin = entry->data;
if (_mesa_hash_table_search(dst->cache, anv_shader_bin_get_key(bin))) if (_mesa_hash_table_search(dst->cache, bin->key))
continue; continue;
anv_shader_bin_ref(bin); anv_shader_bin_ref(bin);
_mesa_hash_table_insert(dst->cache, anv_shader_bin_get_key(bin), bin); _mesa_hash_table_insert(dst->cache, bin->key, bin);
} }
} }

28
src/intel/vulkan/anv_private.h
View File

@@ -516,7 +516,8 @@ struct anv_shader_bin *
anv_pipeline_cache_upload_kernel(struct anv_pipeline_cache *cache, anv_pipeline_cache_upload_kernel(struct anv_pipeline_cache *cache,
const void *key_data, uint32_t key_size, const void *key_data, uint32_t key_size,
const void *kernel_data, uint32_t kernel_size, const void *kernel_data, uint32_t kernel_size,
const void *prog_data, uint32_t prog_data_size, const struct brw_stage_prog_data *prog_data,
uint32_t prog_data_size,
const struct anv_pipeline_bind_map *bind_map); const struct anv_pipeline_bind_map *bind_map);
struct anv_device { struct anv_device {
@@ -1297,16 +1298,24 @@ struct anv_pipeline_bind_map {
struct anv_pipeline_binding * sampler_to_descriptor; struct anv_pipeline_binding * sampler_to_descriptor;
}; };
struct anv_shader_bin_key {
uint32_t size;
uint8_t data[0];
};
struct anv_shader_bin { struct anv_shader_bin {
uint32_t ref_cnt; uint32_t ref_cnt;
const struct anv_shader_bin_key *key;
struct anv_state kernel; struct anv_state kernel;
uint32_t kernel_size; uint32_t kernel_size;
struct anv_pipeline_bind_map bind_map; const struct brw_stage_prog_data *prog_data;
uint32_t prog_data_size; uint32_t prog_data_size;
struct anv_pipeline_bind_map bind_map;
/* Prog data follows, then the key, both aligned to 8-bytes */ /* Prog data follows, then the key, both aligned to 8-bytes */
}; };
@@ -1314,7 +1323,8 @@ struct anv_shader_bin *
anv_shader_bin_create(struct anv_device *device, anv_shader_bin_create(struct anv_device *device,
const void *key, uint32_t key_size, const void *key, uint32_t key_size,
const void *kernel, uint32_t kernel_size, const void *kernel, uint32_t kernel_size,
const void *prog_data, uint32_t prog_data_size, const struct brw_stage_prog_data *prog_data,
uint32_t prog_data_size,
const struct anv_pipeline_bind_map *bind_map); const struct anv_pipeline_bind_map *bind_map);
void void
@@ -1335,14 +1345,6 @@ anv_shader_bin_unref(struct anv_device *device, struct anv_shader_bin *shader)
anv_shader_bin_destroy(device, shader); anv_shader_bin_destroy(device, shader);
} }
static inline const struct brw_stage_prog_data *
anv_shader_bin_get_prog_data(const struct anv_shader_bin *shader)
{
const void *data = shader;
data += align_u32(sizeof(struct anv_shader_bin), 8);
return data;
}
struct anv_pipeline { struct anv_pipeline {
struct anv_device * device; struct anv_device * device;
struct anv_batch batch; struct anv_batch batch;
@@ -1409,7 +1411,7 @@ get_##prefix##_prog_data(struct anv_pipeline *pipeline) \
{ \ { \
if (anv_pipeline_has_stage(pipeline, stage)) { \ if (anv_pipeline_has_stage(pipeline, stage)) { \
return (const struct brw_##prefix##_prog_data *) \ return (const struct brw_##prefix##_prog_data *) \
anv_shader_bin_get_prog_data(pipeline->shaders[stage]); \ pipeline->shaders[stage]->prog_data; \
} else { \ } else { \
return NULL; \ return NULL; \
} \ } \