From d332d2a58a9438a69801dbdc8358b99c4f16f705 Mon Sep 17 00:00:00 2001 From: Thomas Voss Date: Sun, 28 Apr 2024 09:41:39 +0200 Subject: Use a 2-stage lookup table for uprop_get_age() --- gen/prop/age | 153 ++++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 98 insertions(+), 55 deletions(-) (limited to 'gen') diff --git a/gen/prop/age b/gen/prop/age index c6aac06..5733344 100755 --- a/gen/prop/age +++ b/gen/prop/age @@ -1,55 +1,98 @@ -#!/bin/sh - -set -e -cd "${0%/*}/../.." -exec >lib/unicode/prop/uprop_get_age.c - -gawk ' -BEGIN { - FS = " *(; *|#.*)" - - print "/* This file is autogenerated by gen/prop/age; DO NOT EDIT. */" - print "" - print "#include \"_bsearch.h\"" - print "#include \"rune.h\"" - print "#include \"unicode/prop.h\"" - print "" -} - -/^[^#]/ { - n = split($1, a, /\.\./) - lo = strtonum("0X" a[1]) - hi = strtonum("0X" a[n]) - - for (i = lo; i <= hi; i++) { - gsub(/^; /, "", $2) - props[i] = "AGE_V" int($2) "_" ($2 % 1 * 10) - } -} - -END { - print "static const struct {" - print "\trune lo, hi;" - print "\tenum uprop_age val;" - print "} lookup[] = {" - - for (i = 0x1F6; i <= 0x10FFFF; i++) { - if (!props[i]) - continue - lo = i - while (props[lo] == props[i + 1]) - i++ - printf "\t{RUNE_C(0x%06X), RUNE_C(0x%06X), %s},\n", lo, i, props[i] - } - - print "};" - print "" - print "_MLIB_DEFINE_BSEARCH(enum uprop_age, lookup, AGE_NA)" - print "" - print "enum uprop_age" - print "uprop_get_age(rune ch)" - print "{" - print "\treturn ch <= RUNE_C(0x01F5) ? AGE_V1_1 : mlib_lookup(ch);" - print "}" -} -' data/DerivedAge | sed 's/\s*$//' +#!/usr/bin/python3 + +import math + +from lib import * + + +longest = 0 + +def parse(file: str) -> list[bool]: + global longest + + xs = ['AGE_NA'] * 0x110000 + with open(file, 'r') as f: + for line in f.readlines(): + if len(line.strip()) == 0 or line[0] == '#': + continue + + parts = line.split(';') + ranges = [int(x, 16) for x in parts[0].strip().split('..')] + prop = 'AGE_V' + parts[1].split('#')[0].strip().replace('.', '_') + longest = max(longest, len(prop)) + + for i in range(ranges[0], ranges[len(ranges) - 1] + 1): + xs[i] = prop + return xs + +def genfile(cs: list[tuple[bool, ...]], blksize: int) -> None: + Cs = cs + cs = list(dict.fromkeys(Cs)) + + print('''\ +/* This file is autogenerated by gen/prop/age; DO NOT EDIT. */ + +#include "unicode/prop.h" +''') + + print(f'static constexpr {typename(len(cs) - 1)} stage1[] = {{') + for i, c in enumerate(Cs): + print(f'%c%{len(str(len(cs) - 1))}d,' % ('\t' if i % 16 == 0 else ' ', cs.index(c)), end='') + if i % 16 == 15: + print() + print('};') + + print() + + ppc = columns(blksize, longest + 1) + print(f'static constexpr enum uprop_age stage2[][{blksize}] = {{') + for c in cs: + for i in range(blksize // ppc): + print('\t{' if i == 0 else '\t ', end='') + for j in range(ppc): + print(c[i*ppc + j], end='') + if i < blksize // ppc - 1 or j < ppc - 1: + print(',', end='') + if j < ppc - 1: + print(' ' * (longest + 1 - len(c[i*ppc + j])), end='') + if i < blksize // ppc - 1: + print() + print('},') + print('};') + + print() + + print(f'''\ +enum uprop_age +uprop_get_age(rune ch) +{{ + return stage2[stage1[ch / {blksize}]][ch % {blksize}]; +}}''') + +def main() -> None: + cwd_init() + sys.stdout = open('lib/unicode/prop/uprop_get_age.c', 'w') + xs = parse('data/DerivedAge') + + blksize = -1 + smallest = math.inf + + for bs in powers_of_2(): + if bs > len(xs): + break + Cs = [tuple(x) for x in chunks(xs, bs)] + cs = list(dict.fromkeys(Cs)) + + sz_s1 = len(Cs) * isize(len(cs) - 1) + sz_s2 = len(cs) * bs * 2 + sz = sz_s1 + sz_s2 + + if sz < smallest: + smallest = sz + blksize = bs + + Cs = [tuple(x) for x in chunks(xs, blksize)] + genfile(Cs, blksize) + +if __name__ == '__main__': + main() -- cgit v1.2.3