Changeset 1567 for proto/parabix2


Ignore:
Timestamp:
Oct 22, 2011, 6:16:36 PM (8 years ago)
Author:
ksherdy
Message:

Replaced bitblock_bit_count with bitblock::popcount.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • proto/parabix2/src/LineColTracker.hpp

    r1534 r1567  
    55       under the Academic Free License version 3.0.
    66*/
     7
     8#include "../lib/bitblock.hpp"
    79
    810static inline void bitwise_half_add(BitBlock x, BitBlock y, BitBlock &sum, BitBlock &carry){
     
    3234    BitBlock cur_newline;
    3335
    34     int newline_counts;
     36    uint64_t newline_counts;
    3537    BitBlock bitwise_counts[BITWISE_NEWLINE_COUNTER_BITS];
    3638};
     
    5860    if (bitblock::any(carry)){
    5961      for (int i = 0; i < BITWISE_NEWLINE_COUNTER_BITS; i++) {
    60         newline_counts += simd<BLOCKSIZE>::popcount(bitwise_counts[i]) << i;
     62        newline_counts += bitblock::popcount(bitwise_counts[i]) << i;
    6163        bitwise_counts[i]  = mvmd<1>::fill(0);
    6264      }
    63       newline_counts += simd<BLOCKSIZE>::popcount(carry) << BITWISE_NEWLINE_COUNTER_BITS;
     65      newline_counts += bitblock::popcount(carry) << BITWISE_NEWLINE_COUNTER_BITS;
    6466    }
    6567  }
     
    8082 
    8183  if (bitblock::any(cur_newline))
    82     line = newline_counts + simd<BLOCKSIZE>::popcount(cur_newline) + 1;
     84    line = newline_counts + bitblock::popcount(cur_newline) + 1;
    8385  else
    8486    line = newline_counts + 1;
Note: See TracChangeset for help on using the changeset viewer.