krosh/ARSV
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename hash and downsample parameters

Browse Source
This commit is contained in:
krosh
2026-08-10 03:11:37 +03:00
parent 4ed05f2061
commit 39b4673421
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reimplement/set9.c
+6 -10
View File
@@ -15,11 +15,7 @@
#include "set.h" #include "set.h"
#include "system.h" #include "system.h"
// #define CACHE_SIZE 512
#define SET_HASH_SEED UINT32_C(0x9e3779b9)
enum { enum {
// SET_HASH_SEED = UINT32_C(0x9e3779b9),
CACHE_SIZE = 512, CACHE_SIZE = 512,
CACHE_BUCKETS = 1024, CACHE_BUCKETS = 1024,
}; };
@@ -114,7 +110,7 @@ struct set* set_free(struct set* set) {
// --- // ---
static unsigned hash(const char* str) { static unsigned hash(const char* str) {
unsigned hash = SET_HASH_SEED; unsigned hash = UINT32_C(0x9e3779b9);
const unsigned char* p = (const unsigned char*)str; const unsigned char* p = (const unsigned char*)str;
while (*p) { while (*p) {
@@ -550,7 +546,7 @@ static int decode_set(const struct set_meta* meta, unsigned* hash_arr) {
} }
// Bounded decoded-set cache: bucketed lookup plus O(1) LRU updates. // Bounded decoded-set cache: bucketed lookup plus O(1) LRU updates.
static int downsample_set(int cnt, const unsigned* hash_pt, unsigned* ds_pt, int bpp); static int downsample_set(int hash_cnt, const unsigned* hash_pt, unsigned* ds_pt, int target_bpp);
static inline unsigned cache_bucket(uint32_t fingerprint, int target_bpp) { static inline unsigned cache_bucket(uint32_t fingerprint, int target_bpp) {
uint32_t mixed = fingerprint ^ ((uint32_t)target_bpp * UINT32_C(0x85ebca6b)); uint32_t mixed = fingerprint ^ ((uint32_t)target_bpp * UINT32_C(0x85ebca6b));
@@ -676,12 +672,12 @@ static int cache_decode_set(struct set_meta* meta, int target_bpp, const unsigne
} }
// Reduce a set of (bpp + 1) values to a set of bpp values. // Reduce a set of (bpp + 1) values to a set of bpp values.
static int downsample_set(int cnt, const unsigned* hash_pt, unsigned* ds_pt, int bpp) { static int downsample_set(int hash_cnt, const unsigned* hash_pt, unsigned* ds_pt, int target_bpp) {
unsigned mask = (1u << bpp) - 1; unsigned mask = (1u << target_bpp) - 1;
// find the first element with high bit set // find the first element with high bit set
int l = 0; int l = 0;
int u = cnt; int u = hash_cnt;
while (l < u) { while (l < u) {
int i = (l + u) / 2; int i = (l + u) / 2;
@@ -695,7 +691,7 @@ static int downsample_set(int cnt, const unsigned* hash_pt, unsigned* ds_pt, int
// initialize parts // initialize parts
const unsigned* ds_start = ds_pt; const unsigned* ds_start = ds_pt;
const unsigned *v1 = hash_pt + 0, *v1_end = hash_pt + u; const unsigned *v1 = hash_pt + 0, *v1_end = hash_pt + u;
const unsigned *v2 = hash_pt + u, *v2_end = hash_pt + cnt; const unsigned *v2 = hash_pt + u, *v2_end = hash_pt + hash_cnt;
// merge v1 and v2 into w // merge v1 and v2 into w
if (v1 < v1_end && v2 < v2_end) { if (v1 < v1_end && v2 < v2_end) {