#include "radv_debug.h"
#include "radv_private.h"
#include "radv_shader.h"
+#include "vulkan/util/vk_util.h"
#include "ac_nir_to_llvm.h"
char code[0];
};
+static void
+radv_pipeline_cache_lock(struct radv_pipeline_cache *cache)
+{
+ if (cache->flags & VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT_EXT)
+ return;
+
+ pthread_mutex_lock(&cache->mutex);
+}
+
+static void
+radv_pipeline_cache_unlock(struct radv_pipeline_cache *cache)
+{
+ if (cache->flags & VK_PIPELINE_CACHE_CREATE_EXTERNALLY_SYNCHRONIZED_BIT_EXT)
+ return;
+
+ pthread_mutex_unlock(&cache->mutex);
+}
+
void
radv_pipeline_cache_init(struct radv_pipeline_cache *cache,
struct radv_device *device)
{
cache->device = device;
pthread_mutex_init(&cache->mutex, NULL);
+ cache->flags = 0;
cache->modified = false;
cache->kernel_count = 0;
_mesa_sha1_update(&ctx, module->sha1, sizeof(module->sha1));
_mesa_sha1_update(&ctx, stages[i]->pName, strlen(stages[i]->pName));
- if (spec_info) {
+ if (spec_info && spec_info->mapEntryCount) {
_mesa_sha1_update(&ctx, spec_info->pMapEntries,
spec_info->mapEntryCount * sizeof spec_info->pMapEntries[0]);
_mesa_sha1_update(&ctx, spec_info->pData, spec_info->dataSize);
{
struct cache_entry *entry;
- pthread_mutex_lock(&cache->mutex);
+ radv_pipeline_cache_lock(cache);
entry = radv_pipeline_cache_search_unlocked(cache, sha1);
- pthread_mutex_unlock(&cache->mutex);
+ radv_pipeline_cache_unlock(cache);
return entry;
}
return (device->instance->debug_flags & RADV_DEBUG_NO_CACHE);
}
-/*
- * Secure compiles cannot open files so we get the parent process to load the
- * cache entry for us.
- */
-static struct cache_entry *
-radv_sc_read_from_disk_cache(struct radv_device *device, uint8_t *disk_sha1)
-{
- struct cache_entry *entry;
- unsigned process = device->sc_state->secure_compile_thread_counter;
- enum radv_secure_compile_type sc_type = RADV_SC_TYPE_READ_DISK_CACHE;
-
- write(device->sc_state->secure_compile_processes[process].fd_secure_output,
- &sc_type, sizeof(enum radv_secure_compile_type));
- write(device->sc_state->secure_compile_processes[process].fd_secure_output,
- disk_sha1, sizeof(uint8_t) * 20);
-
- uint8_t found_cache_entry;
- if (!radv_sc_read(device->sc_state->secure_compile_processes[process].fd_secure_input,
- &found_cache_entry, sizeof(uint8_t), true))
- return NULL;
-
- if (found_cache_entry) {
- size_t entry_size;
- if (!radv_sc_read(device->sc_state->secure_compile_processes[process].fd_secure_input,
- &entry_size, sizeof(size_t), true))
- return NULL;
-
- entry = malloc(entry_size);
- if (!radv_sc_read(device->sc_state->secure_compile_processes[process].fd_secure_input,
- entry, entry_size, true))
- return NULL;
-
- return entry;
- }
-
- return NULL;
-}
-
-/*
- * Secure compiles cannot open files so we get the parent process to write to
- * the disk cache for us.
- */
-static void
-radv_sc_write_to_disk_cache(struct radv_device *device, uint8_t *disk_sha1,
- struct cache_entry *entry)
-{
- unsigned process = device->sc_state->secure_compile_thread_counter;
- enum radv_secure_compile_type sc_type = RADV_SC_TYPE_WRITE_DISK_CACHE;
-
- write(device->sc_state->secure_compile_processes[process].fd_secure_output,
- &sc_type, sizeof(enum radv_secure_compile_type));
- write(device->sc_state->secure_compile_processes[process].fd_secure_output,
- disk_sha1, sizeof(uint8_t) * 20);
-
- uint32_t size = entry_size(entry);
- write(device->sc_state->secure_compile_processes[process].fd_secure_output,
- &size, sizeof(uint32_t));
- write(device->sc_state->secure_compile_processes[process].fd_secure_output,
- entry, size);
-}
-
bool
radv_create_shader_variants_from_pipeline_cache(struct radv_device *device,
struct radv_pipeline_cache *cache,
*found_in_application_cache = false;
}
- pthread_mutex_lock(&cache->mutex);
+ radv_pipeline_cache_lock(cache);
entry = radv_pipeline_cache_search_unlocked(cache, sha1);
* present in the cache.
*/
if (radv_is_cache_disabled(device) || !device->physical_device->disk_cache) {
- pthread_mutex_unlock(&cache->mutex);
+ radv_pipeline_cache_unlock(cache);
return false;
}
disk_cache_compute_key(device->physical_device->disk_cache,
sha1, 20, disk_sha1);
- if (radv_device_use_secure_compile(device->instance)) {
- entry = radv_sc_read_from_disk_cache(device, disk_sha1);
- } else {
- entry = (struct cache_entry *)
- disk_cache_get(device->physical_device->disk_cache,
- disk_sha1, NULL);
- }
-
+ entry = (struct cache_entry *)
+ disk_cache_get(device->physical_device->disk_cache,
+ disk_sha1, NULL);
if (!entry) {
- pthread_mutex_unlock(&cache->mutex);
+ radv_pipeline_cache_unlock(cache);
return false;
} else {
size_t size = entry_size(entry);
VK_SYSTEM_ALLOCATION_SCOPE_CACHE);
if (!new_entry) {
free(entry);
- pthread_mutex_unlock(&cache->mutex);
+ radv_pipeline_cache_unlock(cache);
return false;
}
p_atomic_inc(&entry->variants[i]->ref_count);
}
- pthread_mutex_unlock(&cache->mutex);
+ radv_pipeline_cache_unlock(cache);
return true;
}
if (!cache)
cache = device->mem_cache;
- pthread_mutex_lock(&cache->mutex);
+ radv_pipeline_cache_lock(cache);
struct cache_entry *entry = radv_pipeline_cache_search_unlocked(cache, sha1);
if (entry) {
for (int i = 0; i < MESA_SHADER_STAGES; ++i) {
if (variants[i])
p_atomic_inc(&variants[i]->ref_count);
}
- pthread_mutex_unlock(&cache->mutex);
+ radv_pipeline_cache_unlock(cache);
return;
}
* present in the cache.
*/
if (radv_is_cache_disabled(device)) {
- pthread_mutex_unlock(&cache->mutex);
+ radv_pipeline_cache_unlock(cache);
return;
}
entry = vk_alloc(&cache->alloc, size, 8,
VK_SYSTEM_ALLOCATION_SCOPE_CACHE);
if (!entry) {
- pthread_mutex_unlock(&cache->mutex);
+ radv_pipeline_cache_unlock(cache);
return;
}
disk_cache_compute_key(device->physical_device->disk_cache, sha1, 20,
disk_sha1);
- /* Write the cache item out to the parent of this forked
- * process.
- */
- if (radv_device_use_secure_compile(device->instance)) {
- radv_sc_write_to_disk_cache(device, disk_sha1, entry);
- } else {
- disk_cache_put(device->physical_device->disk_cache,
- disk_sha1, entry, entry_size(entry),
- NULL);
- }
+ disk_cache_put(device->physical_device->disk_cache, disk_sha1,
+ entry, entry_size(entry), NULL);
}
if (device->instance->debug_flags & RADV_DEBUG_NO_MEMORY_CACHE &&
cache == device->mem_cache) {
vk_free2(&cache->alloc, NULL, entry);
- pthread_mutex_unlock(&cache->mutex);
+ radv_pipeline_cache_unlock(cache);
return;
}
radv_pipeline_cache_add_entry(cache, entry);
cache->modified = true;
- pthread_mutex_unlock(&cache->mutex);
+ radv_pipeline_cache_unlock(cache);
return;
}
-struct cache_header {
- uint32_t header_size;
- uint32_t header_version;
- uint32_t vendor_id;
- uint32_t device_id;
- uint8_t uuid[VK_UUID_SIZE];
-};
-
bool
radv_pipeline_cache_load(struct radv_pipeline_cache *cache,
const void *data, size_t size)
{
struct radv_device *device = cache->device;
- struct cache_header header;
+ struct vk_pipeline_cache_header header;
if (size < sizeof(header))
return false;
if (cache == NULL)
return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY);
+ vk_object_base_init(&device->vk, &cache->base,
+ VK_OBJECT_TYPE_PIPELINE_CACHE);
+
if (pAllocator)
cache->alloc = *pAllocator;
else
cache->alloc = device->vk.alloc;
radv_pipeline_cache_init(cache, device);
+ cache->flags = pCreateInfo->flags;
if (pCreateInfo->initialDataSize > 0) {
radv_pipeline_cache_load(cache,
return;
radv_pipeline_cache_finish(cache);
+ vk_object_base_finish(&cache->base);
vk_free2(&device->vk.alloc, pAllocator, cache);
}
{
RADV_FROM_HANDLE(radv_device, device, _device);
RADV_FROM_HANDLE(radv_pipeline_cache, cache, _cache);
- struct cache_header *header;
+ struct vk_pipeline_cache_header *header;
VkResult result = VK_SUCCESS;
- pthread_mutex_lock(&cache->mutex);
+ radv_pipeline_cache_lock(cache);
const size_t size = sizeof(*header) + cache->total_size;
if (pData == NULL) {
- pthread_mutex_unlock(&cache->mutex);
+ radv_pipeline_cache_unlock(cache);
*pDataSize = size;
return VK_SUCCESS;
}
if (*pDataSize < sizeof(*header)) {
- pthread_mutex_unlock(&cache->mutex);
+ radv_pipeline_cache_unlock(cache);
*pDataSize = 0;
return VK_INCOMPLETE;
}
}
*pDataSize = p - pData;
- pthread_mutex_unlock(&cache->mutex);
+ radv_pipeline_cache_unlock(cache);
return result;
}
projects / mesa.git / blobdiff