-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathtrain_dicts_v2.cpp
More file actions
139 lines (127 loc) · 5.62 KB
/
Copy pathtrain_dicts_v2.cpp
File metadata and controls
139 lines (127 loc) · 5.62 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
// Train all zstd dictionaries: 5 group dicts + 9 per-type micro-dicts
#include <cstdio>
#include <cstdint>
#include <vector>
#include <string>
#include <cstring>
#include <zstd.h>
#include "generators.hpp"
#include "zdict_minimal.h"
struct DictDef {
uint8_t id;
const char* name;
std::vector<std::string> types;
size_t target_size;
};
void train_dict(const DictDef& def, std::vector<uint8_t>& out, size_t& actual) {
std::vector<uint8_t> samples;
std::vector<size_t> sizes;
size_t train_sizes[] = {256, 512, 1024, 2048, 4096, 8192, 16384};
for (auto& key : def.types) {
auto fn = gen::get(key);
if (!fn) { fprintf(stderr, "WARN: no gen for '%s'\n", key.c_str()); continue; }
for (size_t sz : train_sizes) {
auto d = fn(sz);
samples.insert(samples.end(), d.begin(), d.end());
sizes.push_back(d.size());
}
}
out.resize(def.target_size);
size_t r = ZDICT_trainFromBuffer(out.data(), out.size(),
samples.data(), sizes.data(), sizes.size());
if (ZDICT_isError(r)) {
fprintf(stderr, "FAIL %s: %s\n", def.name, ZDICT_getErrorName(r));
actual = 0; return;
}
actual = r;
out.resize(actual);
}
int main() {
// 5 group dicts (16KB each) + 9 micro-dicts (4KB each, saturates early)
std::vector<DictDef> dicts = {
// Group dicts
{1, "CODE", {"python","javascript","typescript","java","go","rust","c","php","css","bash","html"}, 16384},
{2, "CONFIG", {"yaml","toml","docker_compose","terraform","k8s","package_json","cargo_toml","env","makefile"}, 16384},
{3, "TEXT", {"text","markdown","email","unicode"}, 16384},
{4, "LOG", {"nginx_log","access_log","syslog","metrics","json_log"}, 16384},
{5, "QUERY", {"sql","graphql","csv"}, 16384},
// Micro-dicts for the 9 brotli losers at 4KB
{6, "HTML_MICRO", {"html"}, 4096},
{7, "MAKEFILE_MICRO", {"makefile"}, 4096},
{8, "JSONLOG_MICRO", {"json_log"}, 4096},
{9, "UNICODE_MICRO", {"unicode"}, 4096},
{10, "BASH_MICRO", {"bash"}, 4096},
{11, "ENV_MICRO", {"env"}, 4096},
{12, "BASE64_MICRO", {"base64"}, 4096},
{13, "CSV_MICRO", {"csv"}, 4096},
// Image gradient too small (204 bytes training), skip
};
// Train and measure
printf("Training %zu dicts...\n\n", dicts.size());
size_t total_bytes = 0;
std::vector<std::pair<std::vector<uint8_t>, size_t>> results;
for (auto& def : dicts) {
std::vector<uint8_t> d; size_t sz;
train_dict(def, d, sz);
printf("%-18s id=%2d %5zu bytes types: ", def.name, def.id, sz);
for (auto& t : def.types) printf("%s ", t.c_str());
printf("\n");
results.push_back({d, sz});
total_bytes += sz;
}
printf("\nTotal dict size: %zu bytes (%.1fKB)\n", total_bytes, total_bytes / 1024.0);
// Verify against brotli targets
printf("\n=== 4KB Verification vs brotli ===\n");
const char* losers[] = {"html","makefile","json_log","unicode","bash","env","base64","image","csv"};
int brotli_targets[] = {821, 697, 768, 549, 765, 1654, 3106, 26, 819};
for (int li = 0; li < 9; li++) {
auto fn = gen::get(losers[li]);
if (!fn) continue;
auto data = fn(4096);
ZSTD_CCtx* cctx = ZSTD_createCCtx();
std::vector<uint8_t> out(ZSTD_compressBound(4096));
size_t best = SIZE_MAX; int best_id = -1;
for (size_t di = 0; di < dicts.size(); di++) {
if (results[di].second == 0) continue;
size_t sz = ZSTD_compress_usingDict(cctx, out.data(), out.size(),
data.data(), data.size(), results[di].first.data(), results[di].second, 19);
if (!ZSTD_isError(sz) && sz + 1 < best) {
best = sz + 1; best_id = dicts[di].id;
}
}
ZSTD_freeCCtx(cctx);
int gap = (int)best - brotli_targets[li];
printf(" %-15s best=%5zu (dict %2d) brotli=%d %s %+d\n",
losers[li], best, best_id, brotli_targets[li],
gap <= 0 ? "WIN" : "LOSE", gap);
}
// Write header
FILE* f = fopen("mzip_dicts.h", "w");
fprintf(f, "// Auto-generated zstd dictionaries for mzip\n");
fprintf(f, "// 5 group dicts (16KB) + 8 micro-dicts (2-4KB) = %zuKB total\n", total_bytes / 1024);
fprintf(f, "#pragma once\n#include <cstdint>\n#include <cstddef>\n\n");
fprintf(f, "namespace mzip_dicts {\n\n");
for (size_t i = 0; i < dicts.size(); i++) {
if (results[i].second == 0) continue;
fprintf(f, "// Dict %d: %s (%zu bytes)\n", dicts[i].id, dicts[i].name, results[i].second);
fprintf(f, "static const uint8_t DICT_%s[] = {\n", dicts[i].name);
for (size_t j = 0; j < results[i].second; j++) {
if (j % 16 == 0) fprintf(f, " ");
fprintf(f, "0x%02x,", results[i].first[j]);
if (j % 16 == 15 || j == results[i].second - 1) fprintf(f, "\n");
}
fprintf(f, "};\nstatic const size_t DICT_%s_SIZE = %zu;\n\n", dicts[i].name, results[i].second);
}
// Dict table for easy iteration
fprintf(f, "struct DictEntry { uint8_t id; const uint8_t* data; size_t size; };\n");
fprintf(f, "static const DictEntry ALL_DICTS[] = {\n");
for (size_t i = 0; i < dicts.size(); i++) {
if (results[i].second == 0) continue;
fprintf(f, " {%d, DICT_%s, DICT_%s_SIZE},\n", dicts[i].id, dicts[i].name, dicts[i].name);
}
fprintf(f, "};\nstatic const size_t NUM_DICTS = sizeof(ALL_DICTS) / sizeof(ALL_DICTS[0]);\n\n");
fprintf(f, "} // namespace mzip_dicts\n");
fclose(f);
printf("\nWritten to mzip_dicts.h\n");
return 0;
}