Changeset 1982

Timestamp:

03/27/12 20:53:17 (14 months ago)

Author:

ksherdy

Message:

Update main template.

Files:

• trunk/symbol_table/main_template.cpp (modified) (6 diffs)

trunk/symbol_table/main_template.cpp

@@ -28 +28 @@
 
 #include "transpose.hpp"
+#include "buffer.hpp"
+
 #include "../lib/bitblock.hpp"
 #include "../lib/allocator.hpp"
@@ -55 +57 @@
 #endif
 
-///////////////////////////////////////////////////////////////////////////
-// Buffer Management
-///////////////////////////////////////////////////////////////////////////
-#define PADDING_BLOCKS 1
-#define PADDING_SIZE BLOCK_SIZE * PADDING_BLOCKS
-#define LOOKBACK_BLOCKS 1
-#define LOOKBACK_SIZE BLOCK_SIZE * LOOKBACK_BLOCKS
-#define SEGMENT_BLOCKS 10
-#define SEGMENT_SIZE BLOCK_SIZE * (SEGMENT_BLOCKS)                                          // (bytes) a multiple of BLOCK_SIZE
-#define SEGMENT_ALLOC_SIZE (LOOKBACK_SIZE + SEGMENT_SIZE + PADDING_SIZE) / sizeof(BitBlock) // (bytes)
 
 // Target symbol type must inherit from AoS_symbol
@@ -119 +111 @@
     BitBlock * h1 = &lookback_h1[LOOKBACK_SIZE/BLOCK_SIZE];
 
+    // starts
+    BitBlock aligned_starts[SEGMENT_ALLOC_SIZE/8];
+    BitBlock * lookback_starts = (BitBlock *) aligned_starts;
+    memset(lookback_starts,0,LOOKBACK_SIZE/BLOCK_SIZE);
+    BitBlock * starts = &lookback_starts[LOOKBACK_SIZE/BLOCK_SIZE];
+
+    // ends_gte_17
+    BitBlock aligned_ends_gte_17[SEGMENT_ALLOC_SIZE/8];
+    BitBlock * lookback_ends_gte_17 = (BitBlock *) aligned_ends_gte_17;
+    memset(lookback_ends_gte_17,0,LOOKBACK_SIZE/BLOCK_SIZE);
+    BitBlock * ends_gte_17 = &lookback_h1[LOOKBACK_SIZE/BLOCK_SIZE];
+
+
     // BitSteams - Without lookback
     Basis_bits basis_bits[SEGMENT_BLOCKS];
@@ -150 +155 @@
 //    }
 
-      for(int blk=0;blk<SEGMENT_BLOCKS;blk++) { // write contiguous hash bit streams
+      for(int blk=0;blk<SEGMENT_BLOCKS;blk++) { // write contiguous bit streams
         h0[blk] = hash[blk].h0;
         h1[blk] = hash[blk].h1;
+        starts[blk] = groups[blk].starts;
+        ends_gte_17[blk] = groups[blk].ends_gte_17;
       }
 
       PERF_SEC_START(parser_timer);
-      symbol_table.resolve(raw_buffer, groups, h0, h1, SEGMENT_BLOCKS, symbol_ary, SYMBOL_COUNT);
+      symbol_table.resolve(raw_buffer, groups, starts, ends_gte_17, h0, h1, SEGMENT_BLOCKS, symbol_ary, SYMBOL_COUNT);
       PERF_SEC_END(parser_timer, SEGMENT_SIZE);
 
@@ -164 +171 @@
       memmove(lookback_h0,&((uint8_t *)h0)[(SEGMENT_SIZE-LOOKBACK_SIZE)/8],LOOKBACK_SIZE/8);
       memmove(lookback_h1,&((uint8_t *)h1)[(SEGMENT_SIZE-LOOKBACK_SIZE)/8],LOOKBACK_SIZE/8);
+
+      memmove(lookback_starts,&((uint8_t *)starts)[(SEGMENT_SIZE-LOOKBACK_SIZE)/8],LOOKBACK_SIZE/8);
+      memmove(lookback_ends_gte_17,&((uint8_t *)ends_gte_17)[(SEGMENT_SIZE-LOOKBACK_SIZE)/8],LOOKBACK_SIZE/8);
 
       //lookback_h0[0] = h0[SEGMENT_BLOCKS-1];
@@ -203 +213 @@
 //    }
 
-
     uint32_t segment_size = blk;
     for(int blk=0;blk<segment_size;blk++) { // write contiguous hash bit streams
         h0[blk] = hash[blk].h0;
         h1[blk] = hash[blk].h1;
+        starts[blk] = groups[blk].starts;
+        ends_gte_17[blk] = groups[blk].ends_gte_17;
     }
 
     //PERF_SEC_START(parser_timer);
-    symbol_table.resolve(raw_buffer, groups, h0, h1, blk, symbol_ary, SYMBOL_COUNT);
+    symbol_table.resolve(raw_buffer, groups, starts, ends_gte_17, h0, h1, blk, symbol_ary, SYMBOL_COUNT);
     //PERF_SEC_END(parser_timer, chars_avail+1);