Refactored building reinforcement table at compile time and updated comments.

diff --git a/src/fdr/teddy_avx2.c b/src/fdr/teddy_avx2.c
index e1743a9cf3f50a25faf8eaf362b0719af9323d84..56ec739f1176940d601b8fa0028bcc3556f0a6ea 100644 (file)
--- a/src/fdr/teddy_avx2.c
+++ b/src/fdr/teddy_avx2.c
@@ -332,6 +332,29 @@ m512 prep_conf_fat_teddy_m4(const m512 *lo_mask, const m512 *dup_mask,
     prep_conf_fat_teddy_m##n(&lo_mask, dup_mask, ptr,                         \
                              r_msk_base_lo, r_msk_base_hi, &c_0, &c_16)
 
+/*
+ * In FAT teddy, it needs 2 bytes to represent result of each position,
+ * so each nibble's(for example, lo nibble of last byte) FAT teddy mask
+ * has 16x2 bytes:
+ *   |----------------------------------|----------------------------------|
+ *   16bytes (bucket 0..7 in each byte) 16bytes (bucket 8..15 in each byte)
+ *                     A                                  B
+ * at runtime FAT teddy reads 16 bytes once and duplicate them to 32 bytes:
+ *   |----------------------------------|----------------------------------|
+ *   16bytes input data (lo nibbles)    16bytes duplicated data (lo nibbles)
+ *                     X                                  X
+ * then do pshufb_m256(AB, XX).
+ *
+ * In AVX512 reinforced FAT teddy, it reads 32 bytes once and duplicate them
+ * to 64 bytes:
+ *   |----------------|----------------|----------------|----------------|
+ *            X                Y                X                Y
+ * in this case we need DUP_FAT_MASK to construct AABB:
+ *   |----------------|----------------|----------------|----------------|
+ *            A                A                B                B
+ * then do pshufb_m512(AABB, XYXY).
+ */
+
 #define DUP_FAT_MASK(a) mask_set2x256(set2x256(swap128in256(a)), 0xC3, a)
 
 #define PREPARE_FAT_MASKS_1                                                   \

diff --git a/src/fdr/teddy_compile.cpp b/src/fdr/teddy_compile.cpp
index 8b8a64200bd250205dbb3da0610c1f978314d007..3709465b8b4dd38402cd272ba535abee6c7f3648 100644 (file)
--- a/src/fdr/teddy_compile.cpp
+++ b/src/fdr/teddy_compile.cpp
@@ -324,50 +324,44 @@ bool pack(const vector<hwlmLiteral> &lits,
 // each item's reinforcement mask has REINFORCED_MSK_LEN bytes
 #define REINFORCED_MSK_LEN 8
 
+// reinforcement table size for each 8 buckets set
+#define RTABLE_SIZE ((N_CHARS + 1) * REINFORCED_MSK_LEN)
+
 static
-void initReinforcedTable(u8 *rmsk, const size_t rmsklen,
-                         const u32 maskWidth) {
-    for (u32 b = 0; b < maskWidth; b++) {
-        u64a *mask = (u64a *)(rmsk + b * (rmsklen / maskWidth));
-        fill_n(mask, N_CHARS, 0x00ffffffffffffffULL);
-    }
+void initReinforcedTable(u8 *rmsk) {
+    u64a *mask = (u64a *)rmsk;
+    fill_n(mask, N_CHARS, 0x00ffffffffffffffULL);
 }
 
 static
-void fillReinforcedMskZero(u8 *rmsk, const size_t rmsklen,
-                           const u32 maskWidth) {
-    for (u32 b = 0; b < maskWidth; b++) {
-        u8 *mc = rmsk + b * (rmsklen / maskWidth) +
-                 NO_REINFORCEMENT * REINFORCED_MSK_LEN;
-        fill_n(mc, REINFORCED_MSK_LEN, 0x00);
-    }
+void fillReinforcedMskZero(u8 *rmsk) {
+    u8 *mc = rmsk + NO_REINFORCEMENT * REINFORCED_MSK_LEN;
+    fill_n(mc, REINFORCED_MSK_LEN, 0x00);
 }
 
 static
-void fillReinforcedMsk(u8 *rmsk, u32 boff, u16 c, u32 j, u8 bmsk) {
+void fillReinforcedMsk(u8 *rmsk, u16 c, u32 j, u8 bmsk) {
     assert(j > 0);
     if (c == ALL_CHAR_SET) {
         for (size_t i = 0; i < N_CHARS; i++) {
-            u8 *mc = rmsk + boff + i * REINFORCED_MSK_LEN;
+            u8 *mc = rmsk + i * REINFORCED_MSK_LEN;
             mc[j - 1] &= ~bmsk;
         }
     } else {
-        u8 *mc = rmsk + boff + c * REINFORCED_MSK_LEN;
+        u8 *mc = rmsk + c * REINFORCED_MSK_LEN;
         mc[j - 1] &= ~bmsk;
     }
 }
 
 #ifdef TEDDY_DEBUG
 static
-void dumpReinforcedMaskTable(const u8 *rmsk, const size_t rmsklen,
-                             const u32 maskWidth) {
-    for (u32 b = 0; b < maskWidth; b++) {
+void dumpReinforcedMaskTable(const u8 *rmsk, const u32 num_tables) {
+    for (u32 b = 0; b < num_tables; b++) {
         printf("reinforcement table for bucket %u..%u:\n", b * 8, b * 8 + 7);
         for (u32 i = 0; i <= N_CHARS; i++) {
             printf("0x%02x: ", i);
             for (u32 j = 0; j < REINFORCED_MSK_LEN; j++) {
-                u8 val = rmsk[b * (rmsklen / maskWidth) +
-                              i * REINFORCED_MSK_LEN + j];
+                u8 val = rmsk[b * RTABLE_SIZE + i * REINFORCED_MSK_LEN + j];
                 for (u32 k = 0; k < 8; k++) {
                     printf("%s", ((val >> k) & 0x1) ? "1" : "0");
                 }
@@ -455,13 +449,20 @@ static
 void fillReinforcedTable(const map<BucketIndex,
                                    vector<LiteralIndex>> &bucketToLits,
                          const vector<hwlmLiteral> &lits,
-                         u8 *rmsk, const size_t rmsklen, const u32 maskWidth) {
-    initReinforcedTable(rmsk, rmsklen, maskWidth);
+                         u8 *rtable_base, const u32 num_tables) {
+    vector<u8 *> tables;
+    for (u32 i = 0; i < num_tables; i++) {
+        tables.push_back(rtable_base + i * RTABLE_SIZE);
+    }
+
+    for (auto t : tables) {
+        initReinforcedTable(t);
+    }
 
     for (const auto &b2l : bucketToLits) {
         const u32 &bucket_id = b2l.first;
         const vector<LiteralIndex> &ids = b2l.second;
-        const u32 boff = (bucket_id / 8) * (rmsklen / maskWidth);
+        u8 *rmsk = tables[bucket_id / 8];
         const u8 bmsk = 1U << (bucket_id % 8);
 
         for (const LiteralIndex &lit_id : ids) {
@@ -472,23 +473,25 @@ void fillReinforcedTable(const map<BucketIndex,
             // fill in reinforced masks
             for (u32 j = 1; j < REINFORCED_MSK_LEN; j++) {
                 if (sz - 1 < j) {
-                    fillReinforcedMsk(rmsk, boff, ALL_CHAR_SET, j, bmsk);
+                    fillReinforcedMsk(rmsk, ALL_CHAR_SET, j, bmsk);
                 } else {
                     u8 c = l.s[sz - 1 - j];
                     if (l.nocase && ourisalpha(c)) {
                         u8 c_up = c & 0xdf;
-                        fillReinforcedMsk(rmsk, boff, c_up, j, bmsk);
+                        fillReinforcedMsk(rmsk, c_up, j, bmsk);
                         u8 c_lo = c | 0x20;
-                        fillReinforcedMsk(rmsk, boff, c_lo, j, bmsk);
+                        fillReinforcedMsk(rmsk, c_lo, j, bmsk);
                     } else {
-                        fillReinforcedMsk(rmsk, boff, c, j, bmsk);
+                        fillReinforcedMsk(rmsk, c, j, bmsk);
                     }
                 }
             }
         }
     }
 
-    fillReinforcedMskZero(rmsk, rmsklen, maskWidth);
+    for (auto t : tables) {
+        fillReinforcedMskZero(t);
+    }
 }
 
 bytecode_ptr<FDR> TeddyCompiler::build() {
@@ -496,7 +499,7 @@ bytecode_ptr<FDR> TeddyCompiler::build() {
 
     size_t headerSize = sizeof(Teddy);
     size_t maskLen = eng.numMasks * 16 * 2 * maskWidth;
-    size_t reinforcedMaskLen = (N_CHARS + 1) * REINFORCED_MSK_LEN * maskWidth;
+    size_t reinforcedMaskLen = RTABLE_SIZE * maskWidth;
 
     auto floodTable = setupFDRFloodControl(lits, eng, grey);
     auto confirmTable = setupFullConfs(lits, eng, bucketToLits, make_small);
@@ -538,8 +541,7 @@ bytecode_ptr<FDR> TeddyCompiler::build() {
 
     // Write reinforcement masks.
     u8 *reinforcedMsk = baseMsk + ROUNDUP_CL(maskLen);
-    fillReinforcedTable(bucketToLits, lits, reinforcedMsk,
-                        reinforcedMaskLen, maskWidth);
+    fillReinforcedTable(bucketToLits, lits, reinforcedMsk, maskWidth);
 
 #ifdef TEDDY_DEBUG
     for (u32 i = 0; i < eng.numMasks * 2; i++) {
@@ -555,7 +557,7 @@ bytecode_ptr<FDR> TeddyCompiler::build() {
 
     printf("\n===============================================\n"
            "reinforced mask table for low boundary (original)\n\n");
-    dumpReinforcedMaskTable(reinforcedMsk, reinforcedMaskLen, maskWidth);
+    dumpReinforcedMaskTable(reinforcedMsk, maskWidth);
 #endif
 
     return fdr;

diff --git a/src/fdr/teddy_internal.h b/src/fdr/teddy_internal.h
index 174710bc58c57093044afcd0498a46756db30073..1e9e603fa7f1c7c044c34434d3074a4c02e5e25c 100644 (file)
--- a/src/fdr/teddy_internal.h
+++ b/src/fdr/teddy_internal.h
@@ -33,7 +33,10 @@
  * * |     | teddy masks
  * * |     |
  * * |-----|
- * * |     | reinforcement mask table
+ * * |     | reinforcement mask table for bucket 0..7
+ * * |     |
+ * * |-----|
+ * * |     | reinforcement mask table for bucket 8..15 (FAT teddy)
  * * |     |
  * * |-----|
  * * |     | confirm