Changeset 5924


Ignore:
Timestamp:
Mar 21, 2018, 8:03:52 AM (11 months ago)
Author:
cameron
Message:

Various cleanups

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

Legend:

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

    r5919 r5924  
    680680
    681681PointerType * LLVM_READNONE CBuilder::getVoidPtrTy(const unsigned AddressSpace) const {
    682     return PointerType::get(Type::getVoidTy(getContext()), AddressSpace);
     682    //return PointerType::get(Type::getVoidTy(getContext()), AddressSpace);
     683    return PointerType::get(Type::getInt8Ty(getContext()), AddressSpace);
    683684}
    684685
  • icGREP/icgrep-devel/icgrep/kernels/lz4/lz4_swizzled_match_copy_kernel.cpp

    r5907 r5924  
    335335        , mStreamCount(streamCount) {
    336336
    337     assert((mSwizzleFactor == (kb->getBitBlockWidth() / PDEP_width)) && "swizzle factor must equal bitBlockWidth / PDEP_width");
     337    assert((mSwizzleFactor == (iBuilder->getBitBlockWidth() / PDEP_width)) && "swizzle factor must equal bitBlockWidth / PDEP_width");
    338338    assert((mPDEPWidth == 64 || mPDEPWidth == 32) && "PDEP width must be 32 or 64");
    339339
  • icGREP/icgrep-devel/icgrep/lz4d_ext_dep.cpp

    r5921 r5924  
    2323#include <kernels/kernel_builder.h>
    2424#include <toolchain/cpudriver.h>
    25 
     25#include <llvm/Support/raw_ostream.h>
    2626#include <iostream>
    2727#include <lz4/LZ4Generator.h>
     
    5757    LZ4FrameDecoder lz4Frame(fileName);
    5858    if (!lz4Frame.isValid()) {
    59         errs() << "Invalid LZ4 file.\n";
     59        llvm::errs() << "Invalid LZ4 file.\n";
    6060        return -1;
    6161    }
     
    6565            boost::filesystem::remove(outputFile);
    6666        } else {
    67             errs() << outputFile + " existed. Use -f argument to overwrite.\n";
     67            llvm::errs() << outputFile + " existed. Use -f argument to overwrite.\n";
    6868            return -1;
    6969        }
  • icGREP/icgrep-devel/icgrep/toolchain/cpudriver.cpp

    r5920 r5924  
    9393        std::vector<std::string> attrs;
    9494        for (auto &flag : HostCPUFeatures) {
    95             auto enabled = flag.second ? "+" : "-";
    96             attrs.push_back(enabled + flag.first().str());
     95            if (flag.second) {
     96                attrs.push_back("+" + flag.first().str());
     97            }
    9798        }
    9899        builder.setMAttrs(attrs);
     
    139140
    140141void ParabixDriver::makeKernelCall(Kernel * kernel, const std::vector<StreamSetBuffer *> & inputs, const std::vector<StreamSetBuffer *> & outputs) {
    141     assert ("addKernelCall or makeKernelCall was already run on this kernel." && (kernel->getModule() == nullptr));
     142    assert ("makeKernelCall was already run on this kernel." && (kernel->getModule() == nullptr));
    142143    mPipeline.emplace_back(kernel);
    143144    kernel->bindPorts(inputs, outputs);
     
    264265            [&](const std::string &Name) {
    265266                auto Sym = mCompileLayer->findSymbol(Name, false);
     267                if (!Sym) Sym = mCompileLayer->findSymbol(getMangledName(Name), false);
    266268#if LLVM_VERSION_INTEGER <= LLVM_VERSION_CODE(3, 9, 1)
    267269                if (Sym) return Sym.toRuntimeDyldSymbol();
  • icGREP/icgrep-devel/icgrep/toolchain/cpudriver.h

    r5920 r5924  
    88
    99#include <llvm/IR/LegacyPassManager.h>
    10 #if LLVM_VERSION_INTEGER >= LLVM_VERSION_CODE(3, 9, 0)
     10#if LLVM_VERSION_INTEGER >= LLVM_VERSION_CODE(4, 0, 0)
    1111#define ORCJIT
    1212#endif
  • icGREP/icgrep-devel/icgrep/utf16_encoder.cpp

    r5278 r5924  
    99#include <algorithm>
    1010#include <stdexcept>
     11#include <string>
    1112
    1213using namespace UCD;
  • icGREP/icgrep-devel/icgrep/utf8_encoder.cpp

    r5278 r5924  
    99#include <algorithm>
    1010#include <stdexcept>
     11#include <string>
    1112
    1213using namespace UCD;
  • icGREP/icgrep-devel/icgrep/wc.cpp

    r5872 r5924  
    2929static cl::OptionCategory wcFlags("Command Flags", "wc options");
    3030
    31 static cl::list<std::string> inputFiles(cl::Positional, cl::desc("<input file ...>"), cl::OneOrMore, cl::cat(wcFlags));
     31cl::list<std::string> inputFiles(cl::Positional, cl::desc("<input file ...>"), cl::OneOrMore, cl::cat(wcFlags));
    3232
    3333enum CountOptions {
Note: See TracChangeset for help on using the changeset viewer.