rdi make: xfer over per-name-map building path

2026-06-18 01:52:22 -07:00 · 2024-06-06 16:50:02 -07:00
parent 11978904e1
commit 2c4c9e9d75
1 changed files with 99 additions and 0 deletions
@@ -2190,6 +2190,105 @@ RDI_PROC RDIM_NameMapBakeResult
 rdim_bake_name_map(RDIM_Arena *arena, RDIM_BakeStringMapTight *strings, RDIM_BakeIdxRunMap *idx_runs, RDIM_BakeNameMap *src, RDI_U64 base_node_idx)
 {
  RDIM_NameMapBakeResult result = {0};
+  if(src->name_count != 0)
+  {
+    RDI_U32 baked_buckets_count = src->name_count;
+    RDI_U32 baked_nodes_count = src->name_count;
+    RDI_NameMapBucket *baked_buckets = rdim_push_array(arena, RDI_NameMapBucket, baked_buckets_count);
+    RDI_NameMapNode *baked_nodes = rdim_push_array_no_zero(arena, RDI_NameMapNode, baked_nodes_count);
+    {
+      RDIM_Temp scratch = rdim_scratch_begin(&arena, 1);
+      
+      // rjf: setup the final bucket layouts
+      typedef struct RDIM_NameMapSemiNode RDIM_NameMapSemiNode;
+      struct RDIM_NameMapSemiNode
+      {
+        RDIM_NameMapSemiNode *next;
+        RDIM_BakeNameMapNode *node;
+      };
+      typedef struct RDIM_NameMapSemiBucket RDIM_NameMapSemiBucket;
+      struct RDIM_NameMapSemiBucket
+      {
+        RDIM_NameMapSemiNode *first;
+        RDIM_NameMapSemiNode *last;
+        RDI_U64 count;
+      };
+      RDIM_NameMapSemiBucket *sbuckets = rdim_push_array(scratch.arena, RDIM_NameMapSemiBucket, baked_buckets_count);
+      for(RDIM_BakeNameMapNode *node = src->first;
+          node != 0;
+          node = node->order_next)
+      {
+        RDI_U64 hash = rdi_hash(node->string.str, node->string.size);
+        RDI_U64 bi = hash%baked_buckets_count;
+        RDIM_NameMapSemiNode *snode = rdim_push_array(scratch.arena, RDIM_NameMapSemiNode, 1);
+        SLLQueuePush(sbuckets[bi].first, sbuckets[bi].last, snode);
+        snode->node = node;
+        sbuckets[bi].count += 1;
+      }
+      
+      // rjf: convert to serialized buckets & nodes
+      {
+        RDI_NameMapBucket *bucket_ptr = baked_buckets;
+        RDI_NameMapNode *node_ptr = baked_nodes;
+        for(RDI_U32 i = 0; i < baked_buckets_count; i += 1, bucket_ptr += 1)
+        {
+          bucket_ptr->first_node = (RDI_U32)(node_ptr - baked_nodes);
+          bucket_ptr->node_count = sbuckets[i].count;
+          for(RDIM_NameMapSemiNode *snode = sbuckets[i].first;
+              snode != 0;
+              snode = snode->next)
+          {
+            RDIM_BakeNameMapNode *node = snode->node;
+            
+            // rjf: cons name and index(es)
+            RDI_U32 string_idx = rdim_bake_idx_from_string(strings, node->string);
+            RDI_U32 match_count = node->val_count;
+            RDI_U32 idx = 0;
+            if(match_count == 1)
+            {
+              idx = node->val_first->val[0];
+            }
+            else
+            {
+              RDI_U64 temp_pos = rdim_arena_pos(scratch.arena);
+              RDI_U32 *idx_run = rdim_push_array_no_zero(scratch.arena, RDI_U32, match_count);
+              RDI_U32 *idx_ptr = idx_run;
+              for(RDIM_BakeNameMapValNode *idxnode = node->val_first;
+                  idxnode != 0;
+                  idxnode = idxnode->next)
+              {
+                for(RDI_U32 i = 0; i < sizeof(idxnode->val)/sizeof(idxnode->val[0]); i += 1)
+                {
+                  if(idxnode->val[i] == 0)
+                  {
+                    goto dblbreak;
+                  }
+                  *idx_ptr = idxnode->val[i];
+                  idx_ptr += 1;
+                }
+              }
+              dblbreak:;
+              idx = rdim_bake_idx_from_idx_run(idx_runs, idx_run, match_count);
+              rdim_arena_pop_to(scratch.arena, temp_pos);
+            }
+            
+            // rjf: write to node
+            node_ptr->string_idx = string_idx;
+            node_ptr->match_count = match_count;
+            node_ptr->match_idx_or_idx_run_first = idx;
+            node_ptr += 1;
+          }
+        }
+      }
+      rdim_scratch_end(scratch);
+    }
+    
+    // rjf: sections for buckets/nodes
+    result.buckets       = baked_buckets;
+    result.buckets_count = baked_buckets_count;
+    result.nodes         = baked_nodes;
+    result.nodes_count   = baked_nodes_count;
+  }
  return result;
 }