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

anv/allocator: Make the bo_pool dynamically sized

Browse Source
This commit is contained in:
Jason Ekstrand
2016-03-18 13:06:08 -07:00
parent b1c5d45872
commit ecfb074276
3 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/intel/vulkan/anv_allocator.c
View File

@@ -794,12 +794,10 @@ struct bo_pool_bo_link {
}; };
void void
anv_bo_pool_init(struct anv_bo_pool *pool, anv_bo_pool_init(struct anv_bo_pool *pool, struct anv_device *device)
struct anv_device *device, uint32_t bo_size)
{ {
pool->device = device; pool->device = device;
pool->bo_size = bo_size; memset(pool->free_list, 0, sizeof(pool->free_list));
pool->free_list = NULL;
VG(VALGRIND_CREATE_MEMPOOL(pool, 0, false)); VG(VALGRIND_CREATE_MEMPOOL(pool, 0, false));
} }
@@ -807,14 +805,16 @@ anv_bo_pool_init(struct anv_bo_pool *pool,
void void
anv_bo_pool_finish(struct anv_bo_pool *pool) anv_bo_pool_finish(struct anv_bo_pool *pool)
{ {
struct bo_pool_bo_link *link = PFL_PTR(pool->free_list); for (unsigned i = 0; i < ARRAY_SIZE(pool->free_list); i++) {
struct bo_pool_bo_link *link = PFL_PTR(pool->free_list[i]);
while (link != NULL) { while (link != NULL) {
struct bo_pool_bo_link link_copy = VG_NOACCESS_READ(link); struct bo_pool_bo_link link_copy = VG_NOACCESS_READ(link);
anv_gem_munmap(link_copy.bo.map, pool->bo_size); anv_gem_munmap(link_copy.bo.map, link_copy.bo.size);
anv_gem_close(pool->device, link_copy.bo.gem_handle); anv_gem_close(pool->device, link_copy.bo.gem_handle);
link = link_copy.next; link = link_copy.next;
} }
}
VG(VALGRIND_DESTROY_MEMPOOL(pool)); VG(VALGRIND_DESTROY_MEMPOOL(pool));
} }
@@ -824,29 +824,32 @@ anv_bo_pool_alloc(struct anv_bo_pool *pool, struct anv_bo *bo, uint32_t size)
{ {
VkResult result; VkResult result;
assert(pool->bo_size <= size); const unsigned size_log2 = size < 4096 ? 12 : ilog2_round_up(size);
const unsigned pow2_size = 1 << size_log2;
const unsigned bucket = size_log2 - 12;
assert(bucket < ARRAY_SIZE(pool->free_list));
void *next_free_void; void *next_free_void;
if (anv_ptr_free_list_pop(&pool->free_list, &next_free_void)) { if (anv_ptr_free_list_pop(&pool->free_list[bucket], &next_free_void)) {
struct bo_pool_bo_link *next_free = next_free_void; struct bo_pool_bo_link *next_free = next_free_void;
*bo = VG_NOACCESS_READ(&next_free->bo); *bo = VG_NOACCESS_READ(&next_free->bo);
assert(bo->map == next_free); assert(bo->map == next_free);
assert(bo->size == pool->bo_size); assert(size <= bo->size);
VG(VALGRIND_MEMPOOL_ALLOC(pool, bo->map, pool->bo_size)); VG(VALGRIND_MEMPOOL_ALLOC(pool, bo->map, size));
return VK_SUCCESS; return VK_SUCCESS;
} }
struct anv_bo new_bo; struct anv_bo new_bo;
result = anv_bo_init_new(&new_bo, pool->device, pool->bo_size); result = anv_bo_init_new(&new_bo, pool->device, pow2_size);
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
return result; return result;
assert(new_bo.size == pool->bo_size); assert(new_bo.size == pow2_size);
new_bo.map = anv_gem_mmap(pool->device, new_bo.gem_handle, 0, pool->bo_size, 0); new_bo.map = anv_gem_mmap(pool->device, new_bo.gem_handle, 0, pow2_size, 0);
if (new_bo.map == NULL) { if (new_bo.map == NULL) {
anv_gem_close(pool->device, new_bo.gem_handle); anv_gem_close(pool->device, new_bo.gem_handle);
return vk_error(VK_ERROR_MEMORY_MAP_FAILED); return vk_error(VK_ERROR_MEMORY_MAP_FAILED);
@@ -854,7 +857,7 @@ anv_bo_pool_alloc(struct anv_bo_pool *pool, struct anv_bo *bo, uint32_t size)
*bo = new_bo; *bo = new_bo;
VG(VALGRIND_MEMPOOL_ALLOC(pool, bo->map, pool->bo_size)); VG(VALGRIND_MEMPOOL_ALLOC(pool, bo->map, size));
return VK_SUCCESS; return VK_SUCCESS;
} }
@@ -867,6 +870,11 @@ anv_bo_pool_free(struct anv_bo_pool *pool, const struct anv_bo *bo_in)
struct bo_pool_bo_link *link = bo.map; struct bo_pool_bo_link *link = bo.map;
link->bo = bo; link->bo = bo;
assert(util_is_power_of_two(bo.size));
const unsigned size_log2 = ilog2_round_up(bo.size);
const unsigned bucket = size_log2 - 12;
assert(bucket < ARRAY_SIZE(pool->free_list));
VG(VALGRIND_MEMPOOL_FREE(pool, bo.map)); VG(VALGRIND_MEMPOOL_FREE(pool, bo.map));
anv_ptr_free_list_push(&pool->free_list, link); anv_ptr_free_list_push(&pool->free_list[bucket], link);
} }

5
src/intel/vulkan/anv_device.c
View File

@@ -716,8 +716,7 @@ anv_device_submit_simple_batch(struct anv_device *device,
/* Kernel driver requires 8 byte aligned batch length */ /* Kernel driver requires 8 byte aligned batch length */
size = align_u32(batch->next - batch->start, 8); size = align_u32(batch->next - batch->start, 8);
assert(size < device->batch_bo_pool.bo_size); result = anv_bo_pool_alloc(&device->batch_bo_pool, &bo, size);
result = anv_bo_pool_alloc(&device->batch_bo_pool, &bo, 4096);
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
return result; return result;
@@ -829,7 +828,7 @@ VkResult anv_CreateDevice(
pthread_mutex_init(&device->mutex, NULL); pthread_mutex_init(&device->mutex, NULL);
anv_bo_pool_init(&device->batch_bo_pool, device, ANV_CMD_BUFFER_BATCH_SIZE); anv_bo_pool_init(&device->batch_bo_pool, device);
anv_block_pool_init(&device->dynamic_state_block_pool, device, 16384); anv_block_pool_init(&device->dynamic_state_block_pool, device, 16384);

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

@@ -468,13 +468,10 @@ struct anv_state anv_state_stream_alloc(struct anv_state_stream *stream,
struct anv_bo_pool { struct anv_bo_pool {
struct anv_device *device; struct anv_device *device;
uint32_t bo_size; void *free_list[16];
void *free_list;
}; };
void anv_bo_pool_init(struct anv_bo_pool *pool, void anv_bo_pool_init(struct anv_bo_pool *pool, struct anv_device *device);
struct anv_device *device, uint32_t block_size);
void anv_bo_pool_finish(struct anv_bo_pool *pool); void anv_bo_pool_finish(struct anv_bo_pool *pool);
VkResult anv_bo_pool_alloc(struct anv_bo_pool *pool, struct anv_bo *bo, VkResult anv_bo_pool_alloc(struct anv_bo_pool *pool, struct anv_bo *bo,
uint32_t size); uint32_t size);