Changeset 5759


Ignore:
Timestamp:
Dec 7, 2017, 5:48:35 PM (12 months ago)
Author:
cameron
Message:

Small fixes

Location:
icGREP/icgrep-devel/icgrep
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/IR_Gen/idisa_avx_builder.cpp

    r5719 r5759  
    9797   
    9898Value * IDISA_AVX2_Builder::esimd_mergeh(unsigned fw, Value * a, Value * b) {
     99#if LLVM_VERSION_INTEGER < LLVM_6_0_0
    99100    if ((fw == 128) && (mBitBlockWidth == 256)) {
    100101        Value * vperm2i128func = Intrinsic::getDeclaration(getModule(), Intrinsic::x86_avx2_vperm2i128);
    101102        return CreateCall(vperm2i128func, {fwCast(64, a), fwCast(64, b), getInt8(0x31)});
    102103    }
     104#endif
    103105    // Otherwise use default SSE logic.
    104106    return IDISA_SSE_Builder::esimd_mergeh(fw, a, b);
     
    106108
    107109Value * IDISA_AVX2_Builder::esimd_mergel(unsigned fw, Value * a, Value * b) {
     110#if LLVM_VERSION_INTEGER < LLVM_6_0_0
    108111    if ((fw == 128) && (mBitBlockWidth == 256)) {
    109112        Value * vperm2i128func = Intrinsic::getDeclaration(getModule(), Intrinsic::x86_avx2_vperm2i128);
    110113        return CreateCall(vperm2i128func, {fwCast(64, a), fwCast(64, b), getInt8(0x20)});
    111114    }
     115#endif
    112116    // Otherwise use default SSE logic.
    113117    return IDISA_SSE_Builder::esimd_mergel(fw, a, b);
  • icGREP/icgrep-devel/icgrep/UCD/unicode_set.h

    r5755 r5759  
    176176            assert (type == Empty || type == Mixed || type == Full);
    177177            assert (remaining > 0 || type == Empty);
    178             assert (remaining <= UNICODE_MAX);
     178            assert (remaining <= ((UNICODE_MAX+1) / (sizeof(bitquad_t) * 8)));
    179179        }
    180180
  • icGREP/icgrep-devel/icgrep/toolchain/toolchain.cpp

    r5757 r5759  
    128128
    129129bool DebugOptionIsSet(const DebugFlags flag) {
    130     if (flag == EnableAsserts) return true;
    131130    return DebugOptions.isSet(flag);
    132131}
Note: See TracChangeset for help on using the changeset viewer.