Ignore:
Timestamp:
Aug 9, 2012, 8:36:06 PM (7 years ago)
Author:
ksherdy
Message:

Modified symbol table for integration with current ICXML structure.

Location:
trunk/symbol_table/templates
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/symbol_table/templates/group_strms.template.hpp

    r2284 r2291  
    1010@group_strms_stream_stmts
    1111
    12 static IDISA_ALWAYS_INLINE void identity_group_do_block(Markers & markers, Groups & groups) {
     12static IDISA_ALWAYS_INLINE void group_strms_do_block(Marker & marker, Groups & groups) {
    1313        // groups.starts = markers.starts;
    1414        // groups.follows = markers.follows;
     
    1717}
    1818
    19 static IDISA_ALWAYS_INLINE void identity_group_do_final_block(Markers & markers, Groups & groups, BitBlock & EOF_mask) {
     19static IDISA_ALWAYS_INLINE void group_strms_do_final_block(Marker & marker, Groups & groups, BitBlock & EOF_mask) {
    2020        // groups.starts = markers.starts;
    2121        // groups.follows = markers.follows;
  • trunk/symbol_table/templates/main.template.cpp

    r2284 r2291  
    115115    ALLOC_STATIC_ALIGNED_BITBLOCK_BUFFER_WITH_COPYBACK(COPYBACK_starts, starts);
    116116
    117     // follows_0 - Arbitrary length symbols
    118     BitBlock * COPYBACK_follows_0;
    119     BitBlock * follows_0;
    120     ALLOC_STATIC_ALIGNED_BITBLOCK_BUFFER_WITH_COPYBACK(COPYBACK_follows_0, follows_0);
    121 
    122117    ///////////////////////////////////////////////////////////////////////////
    123118    // Parallel Data Streams - No CopyBack
     
    125120
    126121    Basis_bits basis_bits[SEGMENT_BLOCKS];
    127     Markers markers[SEGMENT_BLOCKS];
     122    Marker marker[SEGMENT_BLOCKS];
    128123    Hash hash[SEGMENT_BLOCKS];
    129124    Groups groups[SEGMENT_BLOCKS];
     
    149144                for(blk=0;blk<SEGMENT_BLOCKS;blk++) {
    150145                        s2p_do_block((BytePack *) &src_buffer[blk*BLOCK_SIZE], basis_bits[blk]);    // transpose
    151                         markers_do_block(basis_bits[blk], markers[blk]);                            // gen symbol spans, mark starts & follows
     146                        marker_do_block(basis_bits[blk], marker[blk]);                              // gen symbol spans, mark starts & follows
    152147                        hash_strms_do_block(basis_bits[blk], hash[blk]);                            // gen hash bit streams
    153                         identity_group_do_block(markers[blk], groups[blk]);                         // sort marker bit stream (identity)
     148                        group_strms_do_block(marker[blk], groups[blk]);                     // sort marker bit stream (identity)
    154149    }
    155150
     
    158153                        h1[blk] = hash[blk].h1;
    159154                        starts[blk] = groups[blk].starts;
    160                         follows_0[blk] = groups[blk].follows_0;
    161155    }
    162156
    163157    PERF_SEC_START(parser_timer);
    164     st.resolve(src_buffer, groups, starts, follows_0, h0, h1, SEGMENT_BLOCKS, gids);
     158    st.resolve(src_buffer, groups, starts, h0, h1, SEGMENT_BLOCKS, gids);
    165159    PERF_SEC_END(parser_timer, SEGMENT_SIZE);
    166160
     
    169163    COPY_BACK_BITBLOCK_BUFFER(COPYBACK_h1,h1);
    170164    COPY_BACK_BITBLOCK_BUFFER(COPYBACK_starts,starts);
    171     COPY_BACK_BITBLOCK_BUFFER(COPYBACK_follows_0,follows_0);
    172165
    173166    is.read ((char *)(src_buffer), SEGMENT_SIZE);
     
    181174
    182175                        #ifdef INDEX_AT_STARTS
    183                                         ForwardScanner<BitBlock, scanword_t> scanner(&(groups[blk].starts));
     176                                        ForwardScanner<BitBlock, scanword_t> scanner(&(marker[blk].starts));
    184177                        #else
    185                                         ForwardScanner<BitBlock, scanword_t> scanner(&(groups[blk].follows));
     178                                        ForwardScanner<BitBlock, scanword_t> scanner(&(marker[blk].follows));
    186179                        #endif
    187180
     
    205198    while (remaining >= BLOCK_SIZE) {
    206199                        s2p_do_block((BytePack *) &src_buffer[blk*BLOCK_SIZE], basis_bits[blk]);
    207                         markers_do_block(basis_bits[blk], markers[blk]);
     200                        marker_do_block(basis_bits[blk], marker[blk]);
    208201                        hash_strms_do_block(basis_bits[blk], hash[blk]);
    209                         identity_group_do_block(markers[blk], groups[blk]);
     202                        group_strms_do_block(marker[blk], groups[blk]);
    210203                        blk++;
    211204                        remaining -= BLOCK_SIZE;
     
    218211                        BitBlock EOF_mask = bitblock::srl(simd<1>::constant<1>(), convert(BLOCK_SIZE-remaining));
    219212                        s2p_do_final_block((BytePack *) &src_buffer[blk*BLOCK_SIZE], basis_bits[blk], EOF_mask);
    220                         markers_do_final_block(basis_bits[blk], markers[blk], EOF_mask);
     213                        marker_do_final_block(basis_bits[blk], marker[blk], EOF_mask);
    221214                        hash_strms_do_final_block(basis_bits[blk], hash[blk], EOF_mask);
    222                         identity_group_do_final_block(markers[blk], groups[blk], EOF_mask);
     215                        group_strms_do_final_block(marker[blk], groups[blk], EOF_mask);
    223216                        blk++;
    224217    }
     
    229222                        h1[blk] = hash[blk].h1;
    230223                        starts[blk] = groups[blk].starts;
    231                         follows_0[blk] = groups[blk].follows_0;
    232224    }
    233225
    234226    // PERF_SEC_BIND(0);
    235227    PERF_SEC_START(parser_timer);
    236     st.resolve(src_buffer, groups, starts, follows_0, h0, h1, segment_blocks, gids);
     228    st.resolve(src_buffer, groups, starts, h0, h1, segment_blocks, gids);
    237229    PERF_SEC_END(parser_timer, chars_avail);
    238230
     
    244236
    245237                #ifdef INDEX_AT_STARTS
    246                           ForwardScanner<BitBlock, scanword_t> scanner(&(groups[blk].starts));
     238                          ForwardScanner<BitBlock, scanword_t> scanner(&(marker[blk].starts));
    247239                #else
    248                           ForwardScanner<BitBlock, scanword_t> scanner(&(groups[blk].follows));
     240                          ForwardScanner<BitBlock, scanword_t> scanner(&(marker[blk].follows));
    249241                #endif
    250242
  • trunk/symbol_table/templates/marker_strms.template.hpp

    r2284 r2291  
    99@marker_strms_stream_stmts
    1010
    11 static IDISA_ALWAYS_INLINE void markers_do_block(Basis_bits & basis_bits, Markers & markers) {
     11static IDISA_ALWAYS_INLINE void marker_do_block(Basis_bits & basis_bits, Marker & marker) {
    1212        // GENERATED
    1313        @marker_strms_block_stmts
    1414}
    1515
    16 static IDISA_ALWAYS_INLINE void markers_do_final_block(Basis_bits & basis_bits, Markers & markers, BitBlock & EOF_mask) { //  BitBlock & starts, BitBlock & follows, BitBlock & EOF_mask) {
     16static IDISA_ALWAYS_INLINE void marker_do_final_block(Basis_bits & basis_bits, Marker & marker, BitBlock & EOF_mask) { //  BitBlock & starts, BitBlock & follows, BitBlock & EOF_mask) {
    1717        // GENERATED
    1818        @marker_strms_final_block_stmts
Note: See TracChangeset for help on using the changeset viewer.