Changeset 5498


Ignore:
Timestamp:
Jun 9, 2017, 5:39:30 PM (21 months ago)
Author:
cameron
Message:

Jenkins issues test

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

Legend:

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

    r5493 r5498  
    2121#include <unistd.h>
    2222#include <stdio.h>
     23
     24#if defined(__i386__)
     25typedef uint32_t unw_word_t;
     26#else
     27typedef uint64_t unw_word_t;
     28#endif
    2329#if defined(HAS_MACH_VM_TYPES)
    2430#include <mach/vm_types.h>
     
    496502
    497503PointerType * CBuilder::getVoidPtrTy() const {
    498     return TypeBuilder<void *, false>::get(getContext());
     504    return TypeBuilder<void *, true>::get(getContext());
    499505}
    500506
     
    818824        }
    819825
    820         SmallVector<uint64_t, 64> stack;
     826        SmallVector<unw_word_t, 64> stack;
    821827        #if defined(HAS_MACH_VM_TYPES)
    822828        for (;;) {
     
    882888            }
    883889            if (LLVM_LIKELY(trace == nullptr)) {
    884                 Constant * const initializer = ConstantDataArray::get(getContext(), ArrayRef<uint64_t>(stack.data() + 1, n));
     890                Constant * const initializer = ConstantDataArray::get(getContext(), ArrayRef<unw_word_t>(stack.data() + 1, n));
    885891                trace = new GlobalVariable(*m, initializer->getType(), true, GlobalVariable::InternalLinkage, initializer);
    886892            }
  • icGREP/icgrep-devel/icgrep/kernels/streamset.cpp

    r5497 r5498  
    7474
    7575Value * StreamSetBuffer::getStreamSetCount(IDISA::IDISA_Builder * const iBuilder, Value *) const {
    76     uint64_t count = 1;
     76    size_t count = 1;
    7777    if (isa<ArrayType>(mBaseType)) {
    7878        count = mBaseType->getArrayNumElements();
     
    150150    Type * i8ptr = iBuilder->getInt8PtrTy();
    151151    unsigned alignment = iBuilder->getBitBlockWidth() / 8;
    152     uint64_t numStreams = 1;
     152    size_t numStreams = 1;
    153153    if (isa<ArrayType>(mBaseType)) {
    154154        numStreams = mBaseType->getArrayNumElements();
     
    163163    const unsigned alignment = iBuilder->getBitBlockWidth() / 8;
    164164    Constant * const blockSize = iBuilder->getSize(iBuilder->getBitBlockWidth());
    165     uint64_t numStreams = 1;
     165    size_t numStreams = 1;
    166166    if (isa<ArrayType>(mBaseType)) {
    167167        numStreams = mBaseType->getArrayNumElements();
Note: See TracChangeset for help on using the changeset viewer.