fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 09:38:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

util/set: don't allocate the smallest table, declare it in the struct

Browse source 
When compiling Heaven shaders with radeonsi+ACO, this reduces the total
number of ralloc calls by 10.8%. _mesa_set_init was the biggest user
of ralloc (rzalloc_array) during shader compilation.

Reviewed-by: Gert Wollny <gert.wollny@collabora.com>
Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36728>
This commit is contained in:
Marek Olšák 2025-08-10 00:06:47 -04:00 • committed by Marge Bot
parent 3ead244914
commit 34cfc2600f
2 changed files with 40 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/util/set.c
View file

@ -137,6 +137,7 @@ _mesa_set_init(struct set *ht, void *mem_ctx,
bool (*key_equals_function)(const void *a,
const void *b))
{
ht->mem_ctx = mem_ctx;
ht->size_index = 0;
ht->size = hash_sizes[ht->size_index].size;
ht->rehash = hash_sizes[ht->size_index].rehash;
@ -145,7 +146,9 @@ _mesa_set_init(struct set *ht, void *mem_ctx,
ht->max_entries = hash_sizes[ht->size_index].max_entries;
ht->key_hash_function = key_hash_function;
ht->key_equals_function = key_equals_function;
ht->table = rzalloc_array(mem_ctx, struct set_entry, ht->size);
assert(ht->size == ARRAY_SIZE(ht->_initial_storage));
ht->table = ht->_initial_storage;
memset(ht->table, 0, sizeof(ht->_initial_storage));
ht->entries = 0;
ht->deleted_entries = 0;
@ -216,16 +219,23 @@ _mesa_set_clone(struct set *set, void *dst_mem_ctx)
if (clone == NULL)
return NULL;
memcpy(clone, set, sizeof(struct set));
/* Copy the whole structure except the initial storage. */
memcpy(clone, set, offsetof(struct set, _initial_storage));
clone->mem_ctx = dst_mem_ctx;
clone->table = ralloc_array(clone, struct set_entry, clone->size);
if (clone->table == NULL) {
ralloc_free(clone);
return NULL;
if (set->table != set->_initial_storage) {
clone->table = ralloc_array(dst_mem_ctx, struct set_entry, clone->size);
if (clone->table == NULL) {
ralloc_free(clone);
return NULL;
}
memcpy(clone->table, set->table, clone->size * sizeof(struct set_entry));
} else {
clone->table = clone->_initial_storage;
memcpy(clone->table, set->_initial_storage, sizeof(set->_initial_storage));
}
memcpy(clone->table, set->table, clone->size * sizeof(struct set_entry));
return clone;
}
@ -245,7 +255,8 @@ _mesa_set_fini(struct set *ht,
delete_function(entry);
}
}
ralloc_free(ht->table);
if (ht->table != ht->_initial_storage)
ralloc_free(ht->table);
ht->table = NULL;
}
@ -387,12 +398,19 @@ set_rehash(struct set *ht, unsigned new_size_index)
if (new_size_index >= ARRAY_SIZE(hash_sizes))
return;
table = rzalloc_array(ralloc_parent(ht->table), struct set_entry,
table = rzalloc_array(ht->mem_ctx, struct set_entry,
hash_sizes[new_size_index].size);
if (table == NULL)
return;
old_ht = *ht;
if (ht->table == ht->_initial_storage) {
/* Copy the whole structure including the initial storage. */
old_ht = *ht;
old_ht.table = old_ht._initial_storage;
} else {
/* Copy everything except the initial storage. */
memcpy(&old_ht, ht, offsetof(struct set, _initial_storage));
}
ht->table = table;
ht->size_index = new_size_index;
@ -410,7 +428,8 @@ set_rehash(struct set *ht, unsigned new_size_index)
ht->entries = old_ht.entries;
ralloc_free(old_ht.table);
if (old_ht.table != old_ht._initial_storage)
ralloc_free(old_ht.table);
}
void

9
src/util/set.h
View file

@ -53,6 +53,15 @@ struct set {
uint32_t size_index;
uint32_t entries;
uint32_t deleted_entries;
/* "table" points to here at first. A bigger storage is allocated separately
* when a bigger size is needed.
*/
struct set_entry _initial_storage[19]; /* hash_sizes[0].size */
/* Don't insert any new fields here. All other fields must be before
* _initial_storage.
*/
};
bool