ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-06-14 16:12:24 -07:00
Code Issues Packages Projects Releases Wiki Activity

first pass at checksum baking

Browse Source
This commit is contained in:
Ryan Fleury
2025-10-02 14:17:21 -07:00
parent 56b5792546
commit 403d05cc8b
7 changed files with 153 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_rdi/rdi.c
+3 -1
View File
@@ -10,7 +10,7 @@
#ifndef RDI_C
#define RDI_C
RDI_U16 rdi_section_element_size_table[40] =
RDI_U16 rdi_section_element_size_table[42] =
{
sizeof(RDI_U8),
sizeof(RDI_TopLevelInfo),
@@ -48,6 +48,8 @@ sizeof(RDI_LocationBlock),
sizeof(RDI_U8),
sizeof(RDI_U8),
sizeof(RDI_U32),
sizeof(RDI_U8),
sizeof(RDI_U32),
sizeof(RDI_NameMap),
sizeof(RDI_NameMapBucket),
sizeof(RDI_NameMapNode),
src/lib_rdi/rdi.h
+14 -6
View File
@@ -52,7 +52,7 @@ typedef int64_t RDI_S64;
// "raddbg\0\0"
#define RDI_MAGIC_CONSTANT 0x0000676264646172
#define RDI_ENCODING_VERSION 13
#define RDI_ENCODING_VERSION 14
////////////////////////////////////////////////////////////////
//~ Format Types & Functions
@@ -96,10 +96,12 @@ RDI_SectionKind_LocationBlocks = 0x0020,
RDI_SectionKind_LocationData = 0x0021,
RDI_SectionKind_ConstantValueData = 0x0022,
RDI_SectionKind_ConstantValueTable = 0x0023,
RDI_SectionKind_NameMaps = 0x0024,
RDI_SectionKind_NameMapBuckets = 0x0025,
RDI_SectionKind_NameMapNodes = 0x0026,
RDI_SectionKind_COUNT = 0x0027,
RDI_SectionKind_ChecksumData = 0x0024,
RDI_SectionKind_ChecksumTable = 0x0025,
RDI_SectionKind_NameMaps = 0x0026,
RDI_SectionKind_NameMapBuckets = 0x0027,
RDI_SectionKind_NameMapNodes = 0x0028,
RDI_SectionKind_COUNT = 0x0029,
} RDI_SectionKindEnum;
typedef RDI_U32 RDI_SectionEncoding;
@@ -588,6 +590,8 @@ X(LocationBlocks, location_blocks, RDI_LocationBlock)\
X(LocationData, location_data, RDI_U8)\
X(ConstantValueData, constant_value_data, RDI_U8)\
X(ConstantValueTable, constant_value_table, RDI_U32)\
X(ChecksumData, checksum_data, RDI_U8)\
X(ChecksumTable, checksum_table, RDI_U32)\
X(NameMaps, name_maps, RDI_NameMap)\
X(NameMapBuckets, name_map_buckets, RDI_NameMapBucket)\
X(NameMapNodes, name_map_nodes, RDI_NameMapNode)\
@@ -1169,6 +1173,7 @@ typedef struct RDI_U32_LocationBlocks { RDI_U32 v; } RDI_U32_Locati
typedef struct RDI_U32_LocationData { RDI_U32 v; } RDI_U32_LocationData;
typedef struct RDI_U32_ConstantValueData { RDI_U32 v; } RDI_U32_ConstantValueData;
typedef struct RDI_U32_ConstantValueTable { RDI_U32 v; } RDI_U32_ConstantValueTable;
typedef struct RDI_U32_ChecksumTable { RDI_U32 v; } RDI_U32_ChecksumTable;
typedef struct RDI_U32_NameMaps { RDI_U32 v; } RDI_U32_NameMaps;
typedef struct RDI_U32_NameMapBuckets { RDI_U32 v; } RDI_U32_NameMapBuckets;
typedef struct RDI_U32_NameMapNodes { RDI_U32 v; } RDI_U32_NameMapNodes;
@@ -1205,6 +1210,7 @@ typedef RDI_U32_Table RDI_U32_LocationBlocks;
typedef RDI_U32_Table RDI_U32_LocationData;
typedef RDI_U32_Table RDI_U32_ConstantValueData;
typedef RDI_U32_Table RDI_U32_ConstantValueTable;
typedef RDI_U32_Table RDI_U32_ChecksumTable;
typedef RDI_U32_Table RDI_U32_NameMaps;
typedef RDI_U32_Table RDI_U32_NameMapBuckets;
typedef RDI_U32_Table RDI_U32_NameMapNodes;
@@ -1572,6 +1578,8 @@ typedef RDI_LocationBlock RDI_SectionElementType_LocationBlocks;
typedef RDI_U8 RDI_SectionElementType_LocationData;
typedef RDI_U8 RDI_SectionElementType_ConstantValueData;
typedef RDI_U32 RDI_SectionElementType_ConstantValueTable;
typedef RDI_U8 RDI_SectionElementType_ChecksumData;
typedef RDI_U32 RDI_SectionElementType_ChecksumTable;
typedef RDI_NameMap RDI_SectionElementType_NameMaps;
typedef RDI_NameMapBucket RDI_SectionElementType_NameMapBuckets;
typedef RDI_NameMapNode RDI_SectionElementType_NameMapNodes;
@@ -1584,7 +1592,7 @@ RDI_PROC RDI_EvalConversionKind rdi_eval_conversion_kind_from_typegroups(RDI_Eva
RDI_PROC RDI_S32 rdi_eval_op_typegroup_are_compatible(RDI_EvalOp op, RDI_EvalTypeGroup group);
RDI_PROC RDI_U8 *rdi_explanation_string_from_eval_conversion_kind(RDI_EvalConversionKind kind, RDI_U64 *size_out);
extern RDI_U16 rdi_section_element_size_table[40];
extern RDI_U16 rdi_section_element_size_table[42];
extern RDI_U16 rdi_eval_op_ctrlbits_table[52];
#endif // RDI_H
src/lib_rdi_make/rdi_make.c
+4 -7
View File
@@ -2022,15 +2022,12 @@ rdim_serialized_section_bundle_from_bake_results(RDIM_BakeResults *results)
bundle.sections[RDI_SectionKind_ScopeVMap] = rdim_serialized_section_make_unpacked_array(results->scope_vmap.vmap.vmap, results->scope_vmap.vmap.count);
bundle.sections[RDI_SectionKind_InlineSites] = rdim_serialized_section_make_unpacked_array(results->inline_sites.inline_sites, results->inline_sites.inline_sites_count);
bundle.sections[RDI_SectionKind_Locals] = rdim_serialized_section_make_unpacked_array(results->scopes.locals, results->scopes.locals_count);
bundle.sections[RDI_SectionKind_LocationBlocks] = rdim_serialized_section_make_unpacked_array(results->location_blocks.str, results->location_blocks.size);
bundle.sections[RDI_SectionKind_LocationData] = rdim_serialized_section_make_unpacked_array(results->location_data.str, results->location_data.size);
if(results->location_blocks.size == 0)
{
bundle.sections[RDI_SectionKind_LocationBlocks] = rdim_serialized_section_make_unpacked_array(results->location_blocks2.location_blocks, results->location_blocks2.location_blocks_count);
bundle.sections[RDI_SectionKind_LocationData] = rdim_serialized_section_make_unpacked_array(results->locations.location_data, results->locations.location_data_size);
}
bundle.sections[RDI_SectionKind_LocationBlocks] = rdim_serialized_section_make_unpacked_array(results->location_blocks.location_blocks, results->location_blocks.location_blocks_count);
bundle.sections[RDI_SectionKind_LocationData] = rdim_serialized_section_make_unpacked_array(results->locations.location_data, results->locations.location_data_size);
bundle.sections[RDI_SectionKind_ConstantValueData] = rdim_serialized_section_make_unpacked_array(results->constants.constant_value_data, results->constants.constant_value_data_size);
bundle.sections[RDI_SectionKind_ConstantValueTable] = rdim_serialized_section_make_unpacked_array(results->constants.constant_values, results->constants.constant_values_count);
bundle.sections[RDI_SectionKind_ChecksumData] = rdim_serialized_section_make_unpacked_array(results->checksums.data, results->checksums.data_size);
bundle.sections[RDI_SectionKind_ChecksumTable] = rdim_serialized_section_make_unpacked_array(results->checksums.offs, results->checksums.offs_count);
bundle.sections[RDI_SectionKind_NameMaps] = rdim_serialized_section_make_unpacked_array(results->top_level_name_maps.name_maps, results->top_level_name_maps.name_maps_count);
bundle.sections[RDI_SectionKind_NameMapBuckets] = rdim_serialized_section_make_unpacked_array(results->name_maps.buckets, results->name_maps.buckets_count);
bundle.sections[RDI_SectionKind_NameMapNodes] = rdim_serialized_section_make_unpacked_array(results->name_maps.nodes, results->name_maps.nodes_count);
src/lib_rdi_make/rdi_make.h
+11 -3
View File
@@ -1312,6 +1312,15 @@ struct RDIM_SrcFileBakeResult
RDI_U64 source_line_map_voffs_count;
};
typedef struct RDIM_ChecksumBakeResult RDIM_ChecksumBakeResult;
struct RDIM_ChecksumBakeResult
{
RDI_U32 *offs;
RDI_U64 offs_count;
RDI_U8 *data;
RDI_U64 data_size;
};
typedef struct RDIM_LineTableBakeResult RDIM_LineTableBakeResult;
struct RDIM_LineTableBakeResult
{
@@ -1466,6 +1475,7 @@ struct RDIM_BakeResults
RDIM_UnitBakeResult units;
RDIM_UnitVMapBakeResult unit_vmap;
RDIM_SrcFileBakeResult src_files;
RDIM_ChecksumBakeResult checksums;
RDIM_LineTableBakeResult line_tables;
RDIM_TypeNodeBakeResult type_nodes;
RDIM_UDTBakeResult udts;
@@ -1483,9 +1493,7 @@ struct RDIM_BakeResults
RDIM_StringBakeResult strings;
RDIM_IndexRunBakeResult idx_runs;
RDIM_LocationBakeResult locations;
RDIM_LocationBlockBakeResult location_blocks2;
RDIM_String8 location_blocks;
RDIM_String8 location_data;
RDIM_LocationBlockBakeResult location_blocks;
};
////////////////////////////////
src/rdi/rdi.mdesk
+7 -5
View File
@@ -62,7 +62,7 @@
"";
"// \"raddbg\\0\\0\"";
"#define RDI_MAGIC_CONSTANT 0x0000676264646172";
"#define RDI_ENCODING_VERSION 13";
"#define RDI_ENCODING_VERSION 14";
"";
"////////////////////////////////////////////////////////////////";
"//~ Format Types & Functions";
@@ -156,10 +156,12 @@ RDI_SectionTable:
{LocationData location_data RDI_U8 0x0021 U32 ""}
{ConstantValueData constant_value_data RDI_U8 0x0022 U32 ""}
{ConstantValueTable constant_value_table RDI_U32 0x0023 U32 ""}
{NameMaps name_maps RDI_NameMap 0x0024 U32 ""}
{NameMapBuckets name_map_buckets RDI_NameMapBucket 0x0025 U32 ""}
{NameMapNodes name_map_nodes RDI_NameMapNode 0x0026 U32 ""}
{COUNT count RDI_U8 0x0027 - ""}
{ChecksumData checksum_data RDI_U8 0x0024 - ""}
{ChecksumTable checksum_table RDI_U32 0x0025 U32 ""}
{NameMaps name_maps RDI_NameMap 0x0026 U32 ""}
{NameMapBuckets name_map_buckets RDI_NameMapBucket 0x0027 U32 ""}
{NameMapNodes name_map_nodes RDI_NameMapNode 0x0028 U32 ""}
{COUNT count RDI_U8 0x0029 - ""}
}
@table(name value)
src/rdi_make/rdi_make_local.c
+105 -1
View File
@@ -1920,6 +1920,109 @@ rdim_bake(Arena *arena, RDIM_BakeParams *params)
}
}
//////////////////////////////////////////////////////////////
//- rjf: @rdim_bake_stage compute lane checksum layouts
//
ProfScope("compute lane checksum layouts")
{
// rjf: allocate
if(lane_idx() == 0)
{
rdim_shared->lane_chunk_src_file_checksum_counts = push_array(arena, U64, lane_count()*params->src_files.chunk_count);
rdim_shared->lane_chunk_src_file_checksum_sizes = push_array(arena, U64, lane_count()*params->src_files.chunk_count);
rdim_shared->lane_chunk_src_file_checksum_off_offs = push_array(arena, U64, lane_count()*params->src_files.chunk_count);
rdim_shared->lane_chunk_src_file_checksum_data_offs = push_array(arena, U64, lane_count()*params->src_files.chunk_count);
}
lane_sync();
// rjf: compute counts / sizes of all checksum data
{
U64 chunk_idx = 0;
for EachNode(n, RDIM_SrcFileChunkNode, params->src_files.first)
{
Rng1U64 range = lane_range(n->count);
U64 slot_idx = lane_idx()*params->src_files.chunk_count + chunk_idx;
for EachInRange(n_idx, range)
{
if(n->v[n_idx].checksum_kind != RDI_ChecksumKind_Null && n->v[n_idx].checksum.size != 0)
{
rdim_shared->lane_chunk_src_file_checksum_counts[slot_idx] += 1;
rdim_shared->lane_chunk_src_file_checksum_sizes[slot_idx] += n->v[n_idx].checksum.size;
}
}
chunk_idx += 1;
}
}
lane_sync();
// rjf: lay out per-lane-chunk offsets
if(lane_idx() == 0)
{
U64 off_off = 0;
U64 data_off = 0;
U64 chunk_idx = 0;
for EachNode(n, RDIM_SrcFileChunkNode, params->src_files.first)
{
for EachIndex(l_idx, lane_count())
{
U64 slot_idx = l_idx*params->src_files.chunk_count + chunk_idx;
rdim_shared->lane_chunk_src_file_checksum_off_offs[slot_idx] = off_off;
rdim_shared->lane_chunk_src_file_checksum_data_offs[slot_idx] = data_off;
off_off += rdim_shared->lane_chunk_src_file_checksum_counts[slot_idx];
data_off += rdim_shared->lane_chunk_src_file_checksum_sizes[slot_idx];
}
chunk_idx += 1;
}
rdim_shared->total_checksum_count = off_off;
rdim_shared->total_checksum_size = data_off;
}
}
lane_sync();
//////////////////////////////////////////////////////////////
//- rjf: @rdim_bake_stage bake checksums
//
ProfScope("bake checksums")
{
// rjf: allocate
if(lane_idx() == 0)
{
rdim_shared->baked_checksums.offs_count = rdim_shared->total_checksum_count+1;
rdim_shared->baked_checksums.offs = push_array(arena, U32, rdim_shared->baked_checksums.offs_count);
rdim_shared->baked_checksums.data_size = rdim_shared->total_checksum_size;
rdim_shared->baked_checksums.data = push_array(arena, U8, rdim_shared->baked_checksums.data_size);
}
lane_sync();
// rjf: fill
{
U64 chunk_idx = 0;
for EachNode(n, RDIM_SrcFileChunkNode, params->src_files.first)
{
Rng1U64 range = lane_range(n->count);
U64 slot_idx = lane_idx()*params->src_files.chunk_count + chunk_idx;
U64 dst_off_off = rdim_shared->lane_chunk_src_file_checksum_off_offs[slot_idx];
U64 dst_data_off = rdim_shared->lane_chunk_src_file_checksum_data_offs[slot_idx];
for EachInRange(n_idx, range)
{
if(n->v[n_idx].checksum_kind != RDI_ChecksumKind_Null && n->v[n_idx].checksum.size != 0)
{
rdim_shared->baked_checksums.offs[dst_off_off] = (U32)dst_data_off;
MemoryCopy(&rdim_shared->baked_checksums.data[dst_data_off], n->v[n_idx].checksum.str, n->v[n_idx].checksum.size);
dst_off_off += 1;
dst_data_off += n->v[n_idx].checksum.size;
}
}
chunk_idx += 1;
}
if(lane_idx() == 0)
{
rdim_shared->baked_checksums.offs[rdim_shared->baked_checksums.offs_count-1] = rdim_shared->baked_checksums.data_size;
}
}
}
lane_sync();
//////////////////////////////////////////////////////////////
//- rjf: @rdim_bake_stage compute lane UDT member/enum-val layouts
//
@@ -2849,6 +2952,7 @@ rdim_bake(Arena *arena, RDIM_BakeParams *params)
result.units = rdim_shared->baked_units;
result.unit_vmap = rdim_shared->baked_unit_vmap;
result.src_files = rdim_shared->baked_src_files;
result.checksums = rdim_shared->baked_checksums;
result.line_tables = rdim_shared->baked_line_tables;
result.type_nodes = rdim_shared->baked_type_nodes;
result.udts = rdim_shared->baked_udts;
@@ -2866,7 +2970,7 @@ rdim_bake(Arena *arena, RDIM_BakeParams *params)
result.strings = rdim_shared->baked_strings;
result.idx_runs = rdim_shared->baked_idx_runs;
result.locations = rdim_shared->baked_locations;
result.location_blocks2 = rdim_shared->baked_location_blocks;
result.location_blocks = rdim_shared->baked_location_blocks;
}
return result;
src/rdi_make/rdi_make_local.h
+9
View File
@@ -136,6 +136,15 @@ struct RDIM_Shared
RDIM_SrcFileBakeResult baked_src_files;
RDI_U64 *lane_chunk_src_file_checksum_counts; // [lane_count * src_file_chunk_count]
RDI_U64 *lane_chunk_src_file_checksum_sizes; // [lane_count * src_file_chunk_count]
RDI_U64 *lane_chunk_src_file_checksum_off_offs; // [lane_count * src_file_chunk_count]
RDI_U64 *lane_chunk_src_file_checksum_data_offs; // [lane_count * src_file_chunk_count]
U64 total_checksum_count;
U64 total_checksum_size;
RDIM_ChecksumBakeResult baked_checksums;
RDI_U64 *member_chunk_lane_counts; // [lane_count * udt_chunk_count]
RDI_U64 *member_chunk_lane_offs; // [lane_count * udt_chunk_count]
RDI_U64 *enum_val_chunk_lane_counts; // [lane_count * udt_chunk_count]