diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2023-12-10 02:39:17 -0500 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2024-01-06 20:55:30 +0000 |
| commit | b976f8fc1e61d7f1febbfd1937181a0240ce24de (patch) | |
| tree | 629f37d21fa28637f23f131d492ad9fa60dee1d3 /src/gallium/winsys/amdgpu | |
| parent | 32dae84d43af625359a23071d1a71e0d57795182 (diff) | |
winsys/amdgpu: compute bo->unique_id at pb_slab_alloc, not at memory allocation
We would compute the unique IDs for 1000 slab entries and then only use
a few, wasting the IDs. Assign the IDs only when we actually need to
return a new buffer.
This decreases the number of collisions we get in amdgpu_lookup_buffer,
and thus the number of times we have to search in the BO list.
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26643>
Diffstat (limited to 'src/gallium/winsys/amdgpu')
| -rw-r--r-- | src/gallium/winsys/amdgpu/drm/amdgpu_bo.c | 5 | ||||
| -rw-r--r-- | src/gallium/winsys/amdgpu/drm/amdgpu_bo.h | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c index 3f1753b8c51..95f7c8641b2 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.c @@ -678,7 +678,6 @@ struct pb_slab *amdgpu_bo_slab_alloc(void *priv, unsigned heap, unsigned entry_s struct amdgpu_winsys *ws = priv; enum radeon_bo_domain domains = radeon_domain_from_heap(heap); enum radeon_bo_flag flags = radeon_flags_from_heap(heap); - uint32_t base_id; /* Determine the slab buffer size. */ unsigned max_entry_size = 1 << (ws->bo_slabs.min_order + ws->bo_slabs.num_orders - 1); @@ -737,8 +736,6 @@ struct pb_slab *amdgpu_bo_slab_alloc(void *priv, unsigned heap, unsigned entry_s memset(slab_bo->entries, 0, slab_bo->slab.num_entries * sizeof(*slab_bo->entries)); list_inithead(&slab_bo->slab.free); - base_id = __sync_fetch_and_add(&ws->next_bo_unique_id, slab_bo->slab.num_entries); - for (unsigned i = 0; i < slab_bo->slab.num_entries; ++i) { struct amdgpu_bo_slab_entry *bo = &slab_bo->entries[i]; @@ -746,7 +743,6 @@ struct pb_slab *amdgpu_bo_slab_alloc(void *priv, unsigned heap, unsigned entry_s bo->b.base.alignment_log2 = util_logbase2(get_slab_entry_alignment(ws, entry_size)); bo->b.base.size = entry_size; bo->b.type = AMDGPU_BO_SLAB_ENTRY; - bo->b.unique_id = base_id + i; bo->entry.slab = &slab_bo->slab; list_addtail(&bo->entry.head, &slab_bo->slab.free); @@ -1385,6 +1381,7 @@ amdgpu_bo_create(struct amdgpu_winsys *ws, struct amdgpu_bo_slab_entry *slab_bo = container_of(entry, struct amdgpu_bo_slab_entry, entry); pipe_reference_init(&slab_bo->b.base.reference, 1); slab_bo->b.base.size = size; + slab_bo->b.unique_id = __sync_fetch_and_add(&ws->next_bo_unique_id, 1); assert(alignment <= 1 << slab_bo->b.base.alignment_log2); if (domain & RADEON_DOMAIN_VRAM) diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.h b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.h index 3f496689433..0e4a0ee71f8 100644 --- a/src/gallium/winsys/amdgpu/drm/amdgpu_bo.h +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_bo.h @@ -51,6 +51,9 @@ struct amdgpu_winsys_bo { struct pb_buffer_lean base; enum amdgpu_bo_type type; + /* This is set when a buffer is returned by buffer_create(), not when the memory is allocated + * as part of slab BO. + */ uint32_t unique_id; /* how many command streams, which are being emitted in a separate |