Changeset 973


Ignore:
Timestamp:
Mar 22, 2011, 8:34:11 PM (8 years ago)
Author:
cameron
Message:

Fix ADCMAGIC version

Location:
trunk/lib
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/avx_simd.h

    r962 r973  
    299299#define simd_const_4(n) ((__m256)_mm256_set1_epi8((n) << 4| (n)))
    300300#define simd_const_2(n) simd_const_4((n) << 2 | (n))
    301 #define simd_const_1(n) (n==0 ? simd_const_8(0): simd_const_8(-1))
     301#define simd_const_1(n) (n==0 ? (__m256) _mm256_setzero_ps(): simd_const_8(-1))
    302302
    303303static inline
  • trunk/lib/block_carry_avx.h

    r971 r973  
    381381        __m128i bubble0 = sse_eq_64(sum0, sse_const_1(1));
    382382        __m128i bubble1 = sse_eq_64(sum1, sse_const_1(1));
    383         BitBlock bubble = simd_combine256(max1, max0);
     383        BitBlock bubble = simd_combine256(bubble1, bubble0);
    384384        uint64_t carry_mask = _mm256_movemask_pd((__m256d) icarry) * 2 + carry;
    385385        uint64_t bubble_mask = _mm256_movemask_pd((__m256d) bubble);
  • trunk/lib/carryQ_avx.h

    r960 r973  
    7171
    7272#ifndef CARRY_Q
    73 #include "block_carry.h"
     73#include "block_carry_avx.h"
    7474
    7575
Note: See TracChangeset for help on using the changeset viewer.