diff options
| -rw-r--r-- | src/intel/vulkan/anv_allocator.c | 5 | ||||
| -rw-r--r-- | src/intel/vulkan/meson.build | 6 | ||||
| -rw-r--r-- | src/intel/vulkan/tests/block_pool_grow_first.c | 63 |
3 files changed, 71 insertions, 3 deletions
diff --git a/src/intel/vulkan/anv_allocator.c b/src/intel/vulkan/anv_allocator.c index fa923543703..48d41891cfb 100644 --- a/src/intel/vulkan/anv_allocator.c +++ b/src/intel/vulkan/anv_allocator.c @@ -478,6 +478,11 @@ anv_block_pool_init(struct anv_block_pool *pool, if (result != VK_SUCCESS) goto fail_mmap_cleanups; + /* Make the entire pool available in the front of the pool. If back + * allocation needs to use this space, the "ends" will be re-arranged. + */ + pool->state.end = pool->size; + return VK_SUCCESS; fail_mmap_cleanups: diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index 7fe660983d9..4acc31c526f 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -235,9 +235,9 @@ if with_tests c_args : anv_flags, ) - foreach t : ['block_pool_no_free', 'state_pool_no_free', - 'state_pool_free_list_only', 'state_pool', - 'state_pool_padding'] + foreach t : ['block_pool_no_free', 'block_pool_grow_first', + 'state_pool_no_free', 'state_pool_free_list_only', + 'state_pool', 'state_pool_padding'] test( 'anv_@0@'.format(t), executable( diff --git a/src/intel/vulkan/tests/block_pool_grow_first.c b/src/intel/vulkan/tests/block_pool_grow_first.c new file mode 100644 index 00000000000..aea12b29de8 --- /dev/null +++ b/src/intel/vulkan/tests/block_pool_grow_first.c @@ -0,0 +1,63 @@ +/* + * Copyright © 2015 Intel Corporation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. + */ + +#undef NDEBUG + +#include "anv_private.h" + +int main(int argc, char **argv) +{ + struct anv_instance instance; + struct anv_device device = { + .instance = &instance, + }; + struct anv_block_pool pool; + + /* Create a pool with initial size smaller than the block allocated, so + * that it must grow in the first allocation. + */ + const uint32_t block_size = 16 * 1024; + const uint32_t initial_size = block_size / 2; + + anv_block_pool_init(&pool, &device, 4096, initial_size, EXEC_OBJECT_PINNED); + assert(pool.size == initial_size); + + uint32_t padding; + int32_t offset = anv_block_pool_alloc(&pool, block_size, &padding); + + /* Pool will have grown at least space to fit the new allocation. */ + assert(pool.size > initial_size); + assert(pool.size >= initial_size + block_size); + + /* The whole initial size is considered padding and the allocation should be + * right next to it. + */ + assert(padding == initial_size); + assert(offset == initial_size); + + /* Use the memory to ensure it is valid. */ + void *map = anv_block_pool_map(&pool, offset); + memset(map, 22, block_size); + + anv_block_pool_finish(&pool); +} |