Ignore:
Timestamp:
Nov 14, 2011, 11:59:40 AM (8 years ago)
Author:
vla24
Message:

SymbolTable?: Updated Parallel Bitstream Based Length Sorting Identity grouping template to use BitBlockForwardIterator::init method

File:
1 edited

Legend:

Unmodified
Added
Removed
  • proto/SymbolTable/symtab_pbgs_identity_template.cpp

    r1674 r1683  
    493493    hashvalues[1] = hash_data.Hash_value;
    494494
     495    BitBlockForwardIterator iter;
     496
    495497    if ( bitblock_has_bit(tag_Callouts.ElemName_ends_1) )
    496498    {
    497         BitBlockForwardIterator iter_length_grouping_1(&tag_Callouts.ElemName_ends_1);
    498         validate_block_length_grouping<1>(iter_length_grouping_1, block_base);
     499        iter.init(&tag_Callouts.ElemName_ends_1);
     500        validate_block_length_grouping<1>(iter, block_base);
    499501    }
    500502
    501503    if ( bitblock_has_bit(tag_Callouts.ElemName_ends_2) )
    502504    {
    503         BitBlockForwardIterator iter_length_grouping_2(&tag_Callouts.ElemName_ends_2);
    504         validate_block_length_grouping<2>(iter_length_grouping_2, block_base);
     505        iter.init(&tag_Callouts.ElemName_ends_2);
     506        validate_block_length_grouping<2>(iter, block_base);
    505507    }
    506508
    507509    if ( bitblock_has_bit(tag_Callouts.ElemName_ends_3) )
    508510    {
    509         BitBlockForwardIterator iter_length_grouping_3(&tag_Callouts.ElemName_ends_3);
    510         validate_block_length_grouping<3>(iter_length_grouping_3, block_base);
     511        iter.init(&tag_Callouts.ElemName_ends_3);
     512        validate_block_length_grouping<3>(iter, block_base);
    511513    }
    512514
    513515    if ( bitblock_has_bit(tag_Callouts.ElemName_ends_4) )
    514516    {
    515         BitBlockForwardIterator iter_length_grouping_4(&tag_Callouts.ElemName_ends_4);
    516         validate_block_length_grouping<4>(iter_length_grouping_4, block_base);
     517        iter.init(&tag_Callouts.ElemName_ends_4);
     518        validate_block_length_grouping<4>(iter, block_base);
    517519    }
    518520
    519521    if ( bitblock_has_bit(tag_Callouts.ElemName_ends_5) )
    520522    {
    521         BitBlockForwardIterator iter_length_grouping_5(&tag_Callouts.ElemName_ends_5);
    522         validate_block_length_grouping<5>(iter_length_grouping_5, block_base);
     523        iter.init(&tag_Callouts.ElemName_ends_5);
     524        validate_block_length_grouping<5>(iter, block_base);
    523525    }
    524526
    525527    if ( bitblock_has_bit(tag_Callouts.ElemName_ends_6) )
    526528    {
    527         BitBlockForwardIterator iter_length_grouping_6(&tag_Callouts.ElemName_ends_6);
    528         validate_block_length_grouping<6>(iter_length_grouping_6, block_base);
     529        iter.init(&tag_Callouts.ElemName_ends_6);
     530        validate_block_length_grouping<6>(iter, block_base);
    529531    }
    530532
    531533    if ( bitblock_has_bit(tag_Callouts.ElemName_ends_7) )
    532534    {
    533         BitBlockForwardIterator iter_length_grouping_7(&tag_Callouts.ElemName_ends_7);
    534         validate_block_length_grouping<7>(iter_length_grouping_7, block_base);
     535        iter.init(&tag_Callouts.ElemName_ends_7);
     536        validate_block_length_grouping<7>(iter, block_base);
    535537    }
    536538
    537539    if ( bitblock_has_bit(tag_Callouts.ElemName_ends_8) )
    538540    {
    539         BitBlockForwardIterator iter_length_grouping_8(&tag_Callouts.ElemName_ends_8);
    540         validate_block_length_grouping<8>(iter_length_grouping_8, block_base);
     541        iter.init(&tag_Callouts.ElemName_ends_8);
     542        validate_block_length_grouping<8>(iter, block_base);
    541543    }
    542544
    543545    if ( bitblock_has_bit(tag_Callouts.ElemName_ends_9) )
    544546    {
    545         BitBlockForwardIterator iter_length_grouping_9(&tag_Callouts.ElemName_ends_9);
    546         validate_block_length_grouping<9>(iter_length_grouping_9, block_base);
     547        iter.init(&tag_Callouts.ElemName_ends_9);
     548        validate_block_length_grouping<9>(iter, block_base);
    547549    }
    548550
    549551    if ( bitblock_has_bit(tag_Callouts.ElemName_ends_10) )
    550552    {
    551         BitBlockForwardIterator iter_length_grouping_10(&tag_Callouts.ElemName_ends_10);
    552         validate_block_length_grouping<10>(iter_length_grouping_10, block_base);
     553        iter.init(&tag_Callouts.ElemName_ends_10);
     554        validate_block_length_grouping<10>(iter, block_base);
    553555    }
    554556
    555557    if ( bitblock_has_bit(tag_Callouts.ElemName_ends_11) )
    556558    {
    557         BitBlockForwardIterator iter_length_grouping_11(&tag_Callouts.ElemName_ends_11);
    558         validate_block_length_grouping<11>(iter_length_grouping_11, block_base);
     559        iter.init(&tag_Callouts.ElemName_ends_11);
     560        validate_block_length_grouping<11>(iter, block_base);
    559561    }
    560562
    561563    if ( bitblock_has_bit(tag_Callouts.ElemName_ends_12) )
    562564    {
    563         BitBlockForwardIterator iter_length_grouping_12(&tag_Callouts.ElemName_ends_12);
    564         validate_block_length_grouping<12>(iter_length_grouping_12, block_base);
     565        iter.init(&tag_Callouts.ElemName_ends_12);
     566        validate_block_length_grouping<12>(iter, block_base);
    565567    }
    566568
    567569    if ( bitblock_has_bit(tag_Callouts.ElemName_ends_13) )
    568570    {
    569         BitBlockForwardIterator iter_length_grouping_13(&tag_Callouts.ElemName_ends_13);
    570         validate_block_length_grouping<13>(iter_length_grouping_13, block_base);
     571        iter.init(&tag_Callouts.ElemName_ends_13);
     572        validate_block_length_grouping<13>(iter, block_base);
    571573    }
    572574
    573575    if ( bitblock_has_bit(tag_Callouts.ElemName_ends_14) )
    574576    {
    575         BitBlockForwardIterator iter_length_grouping_14(&tag_Callouts.ElemName_ends_14);
    576         validate_block_length_grouping<14>(iter_length_grouping_14, block_base);
     577        iter.init(&tag_Callouts.ElemName_ends_14);
     578        validate_block_length_grouping<14>(iter, block_base);
    577579    }
    578580
    579581    if ( bitblock_has_bit(tag_Callouts.ElemName_ends_15) )
    580582    {
    581         BitBlockForwardIterator iter_length_grouping_15(&tag_Callouts.ElemName_ends_15);
    582         validate_block_length_grouping<15>(iter_length_grouping_15, block_base);
     583        iter.init(&tag_Callouts.ElemName_ends_15);
     584        validate_block_length_grouping<15>(iter, block_base);
    583585    }
    584586
    585587    if ( bitblock_has_bit(tag_Callouts.ElemName_ends_16) )
    586588    {
    587         BitBlockForwardIterator iter_length_grouping_16(&tag_Callouts.ElemName_ends_16);
    588         validate_block_length_grouping<16>(iter_length_grouping_16, block_base);
     589        iter.init(&tag_Callouts.ElemName_ends_16);
     590        validate_block_length_grouping<16>(iter, block_base);
    589591    }
    590592
    591593    if ( bitblock_has_bit(tag_Callouts.ElemName_ends_17_and_longer) )
    592594    {
    593         BitBlockForwardIterator iter_length_grouping_remaining(&tag_Callouts.ElemName_ends_17_and_longer);
    594         validate_block_length_grouping<17>(iter_length_grouping_remaining, block_base);
     595        iter.init(&tag_Callouts.ElemName_ends_17_and_longer);
     596        validate_block_length_grouping<17>(iter, block_base);
    595597    }
    596598
     
    686688#else
    687689    if (bitblock_has_bit(simd_or(check_streams.non_ascii_name_starts, check_streams.non_ascii_names))) {
    688         BitBlockForwardIterator iter_NameStrt_check(&check_streams.non_ascii_name_starts);
    689         validate_block(iter_NameStrt_check, block_base, NameStrt_check);
    690         BitBlockForwardIterator iter_Name_check(&check_streams.non_ascii_names);
    691         validate_block(iter_Name_check, block_base, Name_check);
     690            iter.init(&check_streams.non_ascii_name_starts);
     691            validate_block(iter, block_base, NameStrt_check);
     692            iter.init(&check_streams.non_ascii_names);
     693            validate_block(iter, block_base, Name_check);
    692694    }
    693695    if (bitblock_has_bit(ctCDPI_Callouts.PI_name_starts)){
    694         BitBlockForwardIterator iter_PI_name_starts(&(ctCDPI_Callouts.PI_name_starts));
    695         validate_block(iter_PI_name_starts, block_base, buffer_base, PIName_check);
     696            iter.init(&(ctCDPI_Callouts.PI_name_starts));
     697            validate_block(iter, block_base, buffer_base, PIName_check);
    696698    }
    697699    if (bitblock_has_bit(ctCDPI_Callouts.CD_starts)){
    698         BitBlockForwardIterator iter_CD_check(&ctCDPI_Callouts.CD_starts);
    699         validate_block(iter_CD_check, block_base, CD_check);
     700            iter.init(&ctCDPI_Callouts.CD_starts);
     701            validate_block(iter, block_base, CD_check);
    700702    }
    701703    if(bitblock_has_bit(ref_Callouts.GenRef_starts)){
    702         BitBlockForwardIterator iter_GenRef_check(&ref_Callouts.GenRef_starts);
    703         validate_block(iter_GenRef_check, block_base, GenRef_check);
     704            iter.init(&ref_Callouts.GenRef_starts);
     705            validate_block(iter, block_base, GenRef_check);
    704706    }
    705707    if(bitblock_has_bit(ref_Callouts.DecRef_starts)){
    706         BitBlockForwardIterator iter_DecRef_check(&ref_Callouts.DecRef_starts);
    707         validate_block(iter_DecRef_check, block_base, DecRef_check);
     708            iter.init(&ref_Callouts.DecRef_starts);
     709            validate_block(iter, block_base, DecRef_check);
    708710    }
    709711    if(bitblock_has_bit(ref_Callouts.HexRef_starts)){
    710         BitBlockForwardIterator iter_HexRef_check(&ref_Callouts.HexRef_starts);
    711         validate_block(iter_HexRef_check, block_base, HexRef_check);
     712            iter.init(&ref_Callouts.HexRef_starts);
     713            validate_block(iter, block_base, HexRef_check);
    712714    }
    713715    if(bitblock_has_bit(check_streams.att_refs)){
    714         BitBlockForwardIterator iter_AttRef_check(&check_streams.att_refs);
    715         validate_block(iter_AttRef_check, block_base, AttRef_check);
     716            iter.init(&check_streams.att_refs);
     717            validate_block(iter, block_base, AttRef_check);
    716718    }
    717719
Note: See TracChangeset for help on using the changeset viewer.