wip

Author: imaami

src/debruijn25.c

@@ -4,6 +4,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #ifdef _MSC_VER
 # define const_inline force_inline
@@ -88,8 +89,8 @@ _Static_assert(sizeof(b25_loc) == sizeof(uint16_t), "b25_loc is 16 bits");
 
 struct b25_info {
 	b25_div  div;
-	u10x3    loc[4];
-	uint32_t mask[12];
+	u10x3    loc[3];
+	uint32_t mask[9];
 };
 
 static const_inline unsigned
@@ -134,6 +135,19 @@ u10x3_append (u10x3 *dst,
 	}
 }
 
+static force_inline unsigned
+b25_div_get (b25_div const *div,
+             uint5          i)
+{
+	return (unsigned)(div->bits >> b25_div_offset(i) & b25_div_mask(i));
+}
+
+static force_inline unsigned
+b25_info_get_num_cycles (struct b25_info const *const src)
+{
+	return src->div.total - b25_div_get(&src->div, 0);
+}
+
 static force_inline void
 b25_info_add_cycle (struct b25_info *dst,
                     unsigned         off,
@@ -143,28 +157,24 @@ b25_info_add_cycle (struct b25_info *dst,
 	if (off > 31U || !prd || prd > 32U)
 		return;
 
-	const unsigned i = dst->div.total;
-	if (i >= 12U)
+	const unsigned i = b25_info_get_num_cycles(dst);
+	if (i >= 9U)
 		return;
 
 	uint5 n = (uint5)(prd - 1U);
-	u10x3_append(&dst->loc[i / 3U], (uint5)off, n);
 	b25_div_add(&dst->div, n);
-	dst->mask[i] = msk;
+	if (prd > 1U) {
+		u10x3_append(&dst->loc[i / 3U], (uint5)off, n);
+		dst->mask[i] = msk;
+	}
 	assert(dst->div.unique < 8U);
 }
 
-static force_inline unsigned
-b25_info_get_num_cycles (struct b25_info const *const src)
-{
-	return src->div.total;
-}
-
 static force_inline b25_loc
 b25_info_get_cycle (struct b25_info const *src,
                     unsigned               i)
 {
-	if (i < src->div.total) {
+	if (i < b25_info_get_num_cycles(src)) {
 		const unsigned n = i % 3U;
 		u10x3 x = src->loc[i / 3U];
 		if (n < x.count) {
@@ -178,13 +188,6 @@ b25_info_get_cycle (struct b25_info const *src,
 	return (b25_loc){0};
 }
 
-static force_inline unsigned
-b25_div_get (b25_div const *div,
-             uint5          i)
-{
-	return (unsigned)(div->bits >> b25_div_offset(i) & b25_div_mask(i));
-}
-
 static force_inline unsigned
 b25_info_get_num_period_cycles (struct b25_info const *const src,
                                 unsigned const               prd)
@@ -462,7 +465,7 @@ b25_info_print (struct b25_info const *const b25,
 	printf("{0x%08" PRIx32 ", 0x%016" PRIx64 ", {%"
 	       PRIu16 ",%" PRIu16 ",%" PRIu16 "}, {%u",
 	       seq, b25->div.bits, id, idx, rot, num);
-	for (unsigned n = 0; ++n < 33U; ) {
+	for (unsigned n = 1; ++n < 33U; ) {
 		unsigned c = b25_info_get_num_period_cycles(b25, n);
 		if (c)
 			printf(",[%u]=%u", n, c);
@@ -479,18 +482,6 @@ b25_info_print (struct b25_info const *const b25,
 	puts("}},");
 }
 
-static int
-alt_main (int    c,
-          char **v)
-{
-	for (int i = 0; ++i < c;) {
-		uint16_t id = (uint16_t)strtoul(v[i], NULL, 0);
-		struct b25_info b25 = b25_info(id);
-		b25_info_print(&b25, id);
-	}
-	return 0;
-}
-
 static const struct perm four8[1] = {
 	{ 6,1439},
 };
@@ -757,3 +748,93 @@ static const struct perm one32[1936] = {
 	{ 7,2031}, { 6,2032}, { 4,2034}, { 6,2037}, {14,2037}, {28,2037}, {19,2040}, {14,2041},
 	{ 6,2042}, {30,2042}, { 4,2043}, {13,2044}, {19,2044}, { 1,2045}, {19,2045}, { 5,2047},
 };
+
+struct bag {
+	uint32_t  seq;
+	uint8_t   head[2];
+	uint8_t   iter[2];
+	char     *ptr[32];
+};
+
+static const uint64_t BAG_DBSEQ[56] = {
+	0xb1aeca7cc653ed7d, 0xab1be9cacc6e53ea, 0x66f2b3e8dfca39be, 0xf46a31f2bb34bea3,
+	0xdf2a232f8ed10cad, 0x8f95df35ca3eacd1, 0xe57da3e3728faa8d, 0x4fb946bc3be5a8b4,
+	0x4538df5884d6477a, 0x18d64dd1fc4ec6be, 0x48b968fb9365937d, 0x1da4971f64cb5be7,
+	0x33ea2593a8df45f3, 0xd4d8e09b98fa896e, 0x89daf97df6a723e7, 0xd94eb7c524e2df4e,
+	0x459d6f890e5769f0, 0x2a6a7dc567a7dae2, 0x2fa1a89767b69f72, 0xfae5ea8bec99ea27,
+	0xebe25cb2717d3ac4, 0xeb14f9db8967d0ac, 0x326c5f5fbeb13936, 0x134c8adf4cd897d5,
+	0xd376be5307d8be6a, 0x13077c9a2addf12c, 0x9371fc4d9752df2b, 0xadcc43c9bac5df15,
+	0x62e6a27d4d9713f4, 0xf6695c7fd8b9a93f, 0xe1a9d97c7dc4b35c, 0x7e1beb299c6beca7,
+	0x1a137594798ca3ed, 0xe9e43ee568b4f95d, 0x691e85cfb48ad646, 0x6393485f3b48a176,
+	0x7c4bb4589f2bb35f, 0xec8a7d73a89767c6, 0x12e2b27c8b2e27d4, 0xc17c9a8ba1cd8afa,
+	0x2d77dc98adef5365, 0xa35f4c72b7dff731, 0xb517bd235d9fd3ec, 0xc4ef9525a89dea93,
+	0xb93ea2a2ca75f04a, 0x7be589d72ea27cab, 0x90d48b7c934d95f0, 0x2b3f289bacfc574d,
+	0xea7df5365c2fd137, 0xcaedf1ba567f465b, 0x2b37df32dc7d70c7, 0xeb28dedd322b7e31,
+	0x2a277cb764d47df8, 0x074cadf1ec4cb7d4, 0x6d4df2c756f6b931, 0x0001c9f51b52ea3e,
+};
+
+static const_inline uint32_t
+bag_seq (unsigned i)
+{
+	if (i > 118U)
+		return 0U;
+
+	unsigned y = (i *= 30U) >> 6U, x = i & 63U;
+	uint32_t s = (uint32_t)(BAG_DBSEQ[y] >> x);
+
+	if (x > 34U)
+		s |= (uint32_t)(BAG_DBSEQ[y + 1U] << (64U - x));
+
+	return ror32((s >> 4U & 0x3fffffeU) | 0x4000001U, s & 0x1fU);
+}
+
+static const_inline struct bag
+bag (unsigned i)
+{
+	if (i > 118U)
+		return (struct bag){0};
+	uint32_t seq = bag_seq(i);
+	uint8_t h2 = i < 65U ? 1U
+	                     : (i < 104U ? (2U + (i >= 88U))
+	                                 : (i < 116U ? (4U + (i >= 110U))
+	                                             : (6U + (i >= 117U))));
+	return (struct bag){
+		.seq = seq,
+		.head = {0, h2},
+		.iter = {0, h2},
+	};
+}
+
+static int
+alt_main (int    c,
+          char **v)
+{
+	for (int i = 0; ++i < c;) {
+		uint16_t id = (uint16_t)strtoul(v[i], NULL, 0);
+		struct b25_info b25 = b25_info(id);
+		b25_info_print(&b25, id);
+	}
+
+	if (c > 1)
+		return 0;
+
+	struct b25_info info[array_size(two16)] = {0};
+	for (size_t i = 0; i < array_size(two16); ++i)
+		info[i] = b25_info(two16[i].seq << 5U | two16[i].rot);
+	for (size_t i = 0; i < array_size(two16); ++i)
+		b25_info_print(&info[i], two16[i].seq << 5U | two16[i].rot);
+
+	char const *const ptr[] = {
+		"\n"," ", "!", ",", ".", "?", "a", "b",
+		"c", "d", "e", "f", "g", "h", "i", "j",
+		"k", "l", "m", "n", "o", "p", "q", "r",
+		"s", "t", "u", "v", "w", "x", "y", "z",
+	};
+
+	for (unsigned i = 0; i < array_size(two16); ++i) {
+		struct bag b = bag(i);
+		memcpy(&b.ptr[0], ptr, sizeof(ptr));
+	}
+
+	return 0;
+}