Add more 2-stage lookup tables

1 files changed, 117 insertions, 80 deletions

diff --git a/gen/prop/dt b/gen/prop/dt
index 12881c5..81503d2 100755
--- a/gen/prop/dt
+++ b/gen/prop/dt
@@ -1,84 +1,121 @@
-#!/bin/sh
-
-set -e
-cd "${0%/*}/../.."
-exec >lib/unicode/prop/uprop_get_dt.c
-
-gawk '
-BEGIN {
-	FS = "( *#.*| +; +)"
-
-	map["Canonical"] = "CAN"
-	map["Compat"]    = "COM"
-	map["Circle"]    = "ENC"
-	map["Final"]     = "FIN"
-	map["Font"]      = "FONT"
-	map["Fraction"]  = "FRA"
-	map["Initial"]   = "INIT"
-	map["Isolated"]  = "ISO"
-	map["Medial"]    = "MED"
-	map["Narrow"]    = "NAR"
-	map["Nobreak"]   = "NB"
-	map["Small"]     = "SML"
-	map["Square"]    = "SQR"
-	map["Sub"]       = "SUB"
-	map["Super"]     = "SUP"
-	map["Vertical"]  = "VERT"
-	map["Wide"]      = "WIDE"
-
-
-	print "/* This file is autogenerated by gen/prop/dt; DO NOT EDIT. */"
-	print ""
-	print "#include \"_bsearch.h\""
-	print "#include \"macros.h\""
-	print "#include \"rune.h\""
-	print "#include \"unicode/prop.h\""
-	print ""
-}
+#!/usr/bin/python3
 
-/^[^#]/ {
-	n = split($1, a, /\.\./)
-	lo = strtonum("0X" a[1])
-	hi = strtonum("0X" a[n])
+import math
+
+from lib import *
 
-	for (i = lo; i <= hi; i++) {
-		gsub(/^; /, "", $2)
-		props[i] = "DT_" map[$2]
-	}
-}
 
-END {
-	print "static constexpr enum uprop_dt lookup_lat1[] = {"
-	for (i = 0; i < 0x100; i++) {
-		if (i % 8 == 0)
-			printf "\t"
-		printf "%-8s%s", (props[i] ? props[i] : "DT_NONE") ",", \
-			i % 8 == 7 ? "\n" : " "
-	}
-	print "};"
-	print ""
-	print "static const struct {"
-	print "\trune lo, hi;"
-	print "\tenum uprop_dt val;"
-	print "} lookup[] = {"
-
-	for (i = 0x100; 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_dt, lookup, DT_NONE)"
-	print ""
-	print "enum uprop_dt"
-	print "uprop_get_dt(rune ch)"
-	print "{"
-	print "\treturn ch < lengthof(lookup_lat1) ? lookup_lat1[ch] : mlib_lookup(ch);"
-	print "}"
+MAP = {
+	'Canonical': 'CAN',
+	'Compat'   : 'COM',
+	'Circle'   : 'ENC',
+	'Final'    : 'FIN',
+	'Font'     : 'FONT',
+	'Fraction' : 'FRA',
+	'Initial'  : 'INIT',
+	'Isolated' : 'ISO',
+	'Medial'   : 'MED',
+	'Narrow'   : 'NAR',
+	'Nobreak'  : 'NB',
+	'Small'    : 'SML',
+	'Square'   : 'SQR',
+	'Sub'      : 'SUB',
+	'Super'    : 'SUP',
+	'Vertical' : 'VERT',
+	'Wide'     : 'WIDE',
 }
-' data/DerivedDecompositionType | sed 's/\s*$//'
+
+longest = 0
+
+def parse(file: str) -> list[bool]:
+	global longest
+
+	xs = ['DT_NONE'] * 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 = 'DT_' + MAP[parts[1].split('#')[0].strip()]
+			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/dt; 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_dt 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_dt
+uprop_get_dt(rune ch)
+{{
+	return stage2[stage1[ch / {blksize}]][ch % {blksize}];
+}}''')
+
+def main() -> None:
+	cwd_init()
+	xs = parse('data/DerivedDecompositionType')
+
+	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 = set(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)]
+	with open('lib/unicode/prop/uprop_get_dt.c', 'w') as f:
+		sys.stdout = f
+		genfile(Cs, blksize)
+
+	report_size(len(xs), smallest)
+
+if __name__ == '__main__':
+	main()