birth-software/bloat-buster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #41 from birth-software/distinguish-hashes

Browse Source 
Distinguish hash types
This commit is contained in:
David 2024-08-10 18:52:58 +02:00 committed by GitHub
commit 157b8eeafb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 36 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bootstrap/lib.h
View File

@ -39,7 +39,8 @@ typedef int64_t s64;
typedef float f32; typedef float f32;
typedef double f64; typedef double f64;
typedef u64 Hash; typedef u32 Hash32;
typedef u64 Hash64;
#define MIN(a, b) (((a) < (b)) ? (a) : (b)) #define MIN(a, b) (((a) < (b)) ? (a) : (b))
#define MAX(a, b) (((a) > (b)) ? (a) : (b)) #define MAX(a, b) (((a) > (b)) ? (a) : (b))
@ -362,17 +363,17 @@ may_be_unused fn u64 is_identifier_ch(u8 ch)
return identifier_start | decimal; return identifier_start | decimal;
} }
global const Hash fnv_offset = 14695981039346656037ull; global const Hash64 fnv_offset = 14695981039346656037ull;
global const u64 fnv_prime = 1099511628211ull; global const u64 fnv_prime = 1099511628211ull;
fn Hash hash_byte(Hash source, u8 ch) fn Hash64 hash_byte(Hash64 source, u8 ch)
{ {
source ^= ch; source ^= ch;
source *= fnv_prime; source *= fnv_prime;
return source; return source;
} }
may_be_unused fn Hash hash_bytes(String bytes) may_be_unused fn Hash64 hash_bytes(String bytes)
{ {
u64 result = fnv_offset; u64 result = fnv_offset;
for (u64 i = 0; i < bytes.length; i += 1) for (u64 i = 0; i < bytes.length; i += 1)

73
bootstrap/main.c
View File

@ -152,8 +152,8 @@ fn StringMapPut string_map_put_assume_not_existent(StringMap* map, Arena* arena,
fn StringMapPut string_map_get(StringMap* map, String key) fn StringMapPut string_map_get(StringMap* map, String key)
{ {
u32 value = 0; u32 value = 0;
Hash long_hash = hash_bytes(key); auto long_hash = hash_bytes(key);
auto hash = (u32)long_hash; auto hash = (Hash32)long_hash;
assert(hash); assert(hash);
auto index = hash & (map->capacity - 1); auto index = hash & (map->capacity - 1);
auto slot = string_map_find_slot(map, index, key); auto slot = string_map_find_slot(map, index, key);
@ -173,8 +173,8 @@ fn StringMapPut string_map_get(StringMap* map, String key)
fn StringMapPut string_map_put(StringMap* map, Arena* arena, String key, u32 value) fn StringMapPut string_map_put(StringMap* map, Arena* arena, String key, u32 value)
{ {
Hash long_hash = hash_bytes(key); auto long_hash = hash_bytes(key);
auto hash = (u32)long_hash; auto hash = (Hash32)long_hash;
assert(hash); assert(hash);
auto index = hash & (map->capacity - 1); auto index = hash & (map->capacity - 1);
auto slot = string_map_find_slot(map, index, key); auto slot = string_map_find_slot(map, index, key);
@ -528,7 +528,7 @@ typedef struct TypeTuple TypeTuple;
struct Type struct Type
{ {
Hash hash; Hash64 hash;
union union
{ {
TypeInteger integer; TypeInteger integer;
@ -673,7 +673,7 @@ typedef struct NodeDeadControl NodeDeadControl;
struct Node struct Node
{ {
Hash hash; Hash64 hash;
u32 input_offset; u32 input_offset;
u32 output_offset; u32 output_offset;
u32 dependency_offset; u32 dependency_offset;
@ -1427,9 +1427,9 @@ fn u8 type_equal(Type* a, Type* b)
return result; return result;
} }
fn Hash hash_type(Thread* thread, Type* type); fn Hash64 hash_type(Thread* thread, Type* type);
fn Hash node_get_hash_default(Thread* thread, Node* node, NodeIndex node_index, Hash hash) fn Hash64 node_get_hash_default(Thread* thread, Node* node, NodeIndex node_index, Hash64 hash)
{ {
unused(thread); unused(thread);
unused(node); unused(node);
@ -1437,7 +1437,7 @@ fn Hash node_get_hash_default(Thread* thread, Node* node, NodeIndex node_index,
return hash; return hash;
} }
fn Hash node_get_hash_projection(Thread* thread, Node* node, NodeIndex node_index, Hash hash) fn Hash64 node_get_hash_projection(Thread* thread, Node* node, NodeIndex node_index, Hash64 hash)
{ {
unused(thread); unused(thread);
unused(node_index); unused(node_index);
@ -1451,7 +1451,7 @@ fn Hash node_get_hash_projection(Thread* thread, Node* node, NodeIndex node_inde
return hash; return hash;
} }
fn Hash node_get_hash_control_projection(Thread* thread, Node* node, NodeIndex node_index, Hash hash) fn Hash64 node_get_hash_control_projection(Thread* thread, Node* node, NodeIndex node_index, Hash64 hash)
{ {
unused(thread); unused(thread);
unused(node_index); unused(node_index);
@ -1465,7 +1465,7 @@ fn Hash node_get_hash_control_projection(Thread* thread, Node* node, NodeIndex n
return hash; return hash;
} }
fn Hash node_get_hash_constant(Thread* thread, Node* node, NodeIndex node_index, Hash hash) fn Hash64 node_get_hash_constant(Thread* thread, Node* node, NodeIndex node_index, Hash64 hash)
{ {
unused(node_index); unused(node_index);
assert(hash == fnv_offset); assert(hash == fnv_offset);
@ -1476,7 +1476,7 @@ fn Hash node_get_hash_constant(Thread* thread, Node* node, NodeIndex node_index,
return type_hash; return type_hash;
} }
fn Hash node_get_hash_scope(Thread* thread, Node* node, NodeIndex node_index, Hash hash) fn Hash64 node_get_hash_scope(Thread* thread, Node* node, NodeIndex node_index, Hash64 hash)
{ {
unused(thread); unused(thread);
unused(node); unused(node);
@ -1561,8 +1561,8 @@ fn TypeGetOrPut intern_pool_get_or_put_new_type(Thread* thread, Type* type);
typedef NodeIndex NodeIdealize(Thread* thread, NodeIndex node_index); typedef NodeIndex NodeIdealize(Thread* thread, NodeIndex node_index);
typedef TypeIndex NodeComputeType(Thread* thread, NodeIndex node_index); typedef TypeIndex NodeComputeType(Thread* thread, NodeIndex node_index);
typedef Hash TypeGetHash(Thread* thread, Type* type); typedef Hash64 TypeGetHash(Thread* thread, Type* type);
typedef Hash NodeGetHash(Thread* thread, Node* node, NodeIndex node_index, Hash hash); typedef Hash64 NodeGetHash(Thread* thread, Node* node, NodeIndex node_index, Hash64 hash);
fn TypeIndex thread_get_integer_type(Thread* thread, TypeInteger type_integer) fn TypeIndex thread_get_integer_type(Thread* thread, TypeInteger type_integer)
{ {
@ -1622,7 +1622,7 @@ struct TypeVirtualTable
TypeGetHash* const get_hash; TypeGetHash* const get_hash;
}; };
typedef struct TypeVirtualTable TypeVirtualTable; typedef struct TypeVirtualTable TypeVirtualTable;
fn Hash hash_type(Thread* thread, Type* type); fn Hash64 hash_type(Thread* thread, Type* type);
fn NodeIndex idealize_null(Thread* thread, NodeIndex node_index) fn NodeIndex idealize_null(Thread* thread, NodeIndex node_index)
{ {
@ -1638,11 +1638,11 @@ fn TypeIndex compute_type_constant(Thread* thread, NodeIndex node_index)
return node->constant.type; return node->constant.type;
} }
fn Hash type_get_hash_default(Thread* thread, Type* type) fn Hash64 type_get_hash_default(Thread* thread, Type* type)
{ {
unused(thread); unused(thread);
assert(!type->hash); assert(!type->hash);
Hash hash = fnv_offset; Hash64 hash = fnv_offset;
// u32 i = 0; // u32 i = 0;
for (auto* it = (u8*)type; it < (u8*)(type + 1); it += 1) for (auto* it = (u8*)type; it < (u8*)(type + 1); it += 1)
@ -1658,9 +1658,9 @@ fn Hash type_get_hash_default(Thread* thread, Type* type)
return hash; return hash;
} }
fn Hash type_get_hash_tuple(Thread* thread, Type* type) fn Hash64 type_get_hash_tuple(Thread* thread, Type* type)
{ {
Hash hash = fnv_offset; Hash64 hash = fnv_offset;
for (u64 i = 0; i < type->tuple.types.length; i += 1) for (u64 i = 0; i < type->tuple.types.length; i += 1)
{ {
auto* tuple_type = thread_type_get(thread,type->tuple.types.pointer[i]); auto* tuple_type = thread_type_get(thread,type->tuple.types.pointer[i]);
@ -1778,7 +1778,7 @@ fn TypeIndex intern_pool_put_new_type_at_assume_not_existent_assume_capacity(Thr
fn TypeIndex intern_pool_put_new_type_assume_not_existent_assume_capacity(Thread* thread, Type* type) fn TypeIndex intern_pool_put_new_type_assume_not_existent_assume_capacity(Thread* thread, Type* type)
{ {
assert(thread->interned.types.length < thread->interned.types.capacity); assert(thread->interned.types.length < thread->interned.types.capacity);
Hash hash = type->hash; Hash64 hash = type->hash;
assert(hash); assert(hash);
auto index = hash & (thread->interned.types.capacity - 1); auto index = hash & (thread->interned.types.capacity - 1);
@ -1836,17 +1836,9 @@ fn u8 node_equal(Thread* thread, Node* a, Node* b)
fn u8 node_index_equal(Thread* thread, NodeIndex a, NodeIndex b) fn u8 node_index_equal(Thread* thread, NodeIndex a, NodeIndex b)
{ {
u8 result = 0; u8 result = 0;
if (index_equal(a, b)) auto* node_a = thread_node_get(thread, a);
{ auto* node_b = thread_node_get(thread, b);
result = 1; result = index_equal(a, b) || node_equal(thread, node_a, node_b);
}
else
{
auto* node_a = thread_node_get(thread, a);
auto* node_b = thread_node_get(thread, b);
assert(node_a != node_b);
result = node_equal(thread, node_a, node_b);
}
return result; return result;
} }
@ -1887,7 +1879,7 @@ fn u8 node_index_equal(Thread* thread, NodeIndex a, NodeIndex b)
return result; return result;
} }
fn NodeIndex intern_pool_get_node(Thread* thread, NodeIndex key, Hash hash) fn NodeIndex intern_pool_get_node(Thread* thread, NodeIndex key, Hash64 hash)
{ {
auto original_index = hash & (thread->interned.nodes.capacity - 1); auto original_index = hash & (thread->interned.nodes.capacity - 1);
auto slot = intern_pool_find_node_slot(thread, original_index, key); auto slot = intern_pool_find_node_slot(thread, original_index, key);
@ -1905,7 +1897,7 @@ fn NodeIndex intern_pool_put_node_at_assume_not_existent_assume_capacity(Thread*
return node; return node;
} }
fn NodeIndex intern_pool_put_node_assume_not_existent_assume_capacity(Thread* thread, Hash hash, NodeIndex node) fn NodeIndex intern_pool_put_node_assume_not_existent_assume_capacity(Thread* thread, Hash64 hash, NodeIndex node)
{ {
auto capacity = thread->interned.nodes.capacity; auto capacity = thread->interned.nodes.capacity;
assert(thread->interned.nodes.length < capacity); assert(thread->interned.nodes.length < capacity);
@ -1963,7 +1955,7 @@ fn void intern_pool_ensure_capacity(InternPool* pool, Thread* thread, u32 additi
auto key = old_pointer[i]; auto key = old_pointer[i];
if (key) if (key)
{ {
auto hash = *(Hash*)(buffer + (stride * (key - 1))); auto hash = *(Hash64*)(buffer + (stride * (key - 1)));
assert(hash); assert(hash);
switch (kind) switch (kind)
{ {
@ -1993,7 +1985,7 @@ fn void intern_pool_ensure_capacity(InternPool* pool, Thread* thread, u32 additi
auto key = old_pointer[i]; auto key = old_pointer[i];
if (key) if (key)
{ {
auto hash = *(Hash*)(buffer + (stride * (key - 1))); auto hash = *(Hash64*)(buffer + (stride * (key - 1)));
assert(hash); assert(hash);
switch (kind) switch (kind)
{ {
@ -2521,9 +2513,9 @@ may_be_unused fn String type_id_to_string(Type* type)
} }
} }
fn Hash hash_type(Thread* thread, Type* type) fn Hash64 hash_type(Thread* thread, Type* type)
{ {
Hash hash = type->hash; Hash64 hash = type->hash;
if (!hash) if (!hash)
{ {
@ -2537,7 +2529,7 @@ fn Hash hash_type(Thread* thread, Type* type)
return hash; return hash;
} }
fn NodeIndex intern_pool_put_node_assume_not_existent(Thread* thread, Hash hash, NodeIndex node) fn NodeIndex intern_pool_put_node_assume_not_existent(Thread* thread, Hash64 hash, NodeIndex node)
{ {
intern_pool_ensure_capacity(&thread->interned.nodes, thread, 1, INTERN_POOL_KIND_NODE); intern_pool_ensure_capacity(&thread->interned.nodes, thread, 1, INTERN_POOL_KIND_NODE);
return intern_pool_put_node_assume_not_existent_assume_capacity(thread, hash, node); return intern_pool_put_node_assume_not_existent_assume_capacity(thread, hash, node);
@ -2550,10 +2542,7 @@ struct NodeGetOrPut
}; };
typedef struct NodeGetOrPut NodeGetOrPut; typedef struct NodeGetOrPut NodeGetOrPut;
fn Hash64 hash_node(Thread* thread, Node* node, NodeIndex node_index)
fn Hash hash_node(Thread* thread, Node* node, NodeIndex node_index)
{ {
auto hash = node->hash; auto hash = node->hash;
if (!hash) if (!hash)