Changeset 5924

Timestamp:

Mar 21, 2018, 8:03:52 AM (11 months ago)

Author:

cameron

Message:

Various cleanups

Location:

icGREP/icgrep-devel/icgrep

Files:

• IR_Gen/CBuilder.cpp (modified) (1 diff)
• kernels/lz4/lz4_swizzled_match_copy_kernel.cpp (modified) (1 diff)
• lz4d_ext_dep.cpp (modified) (3 diffs)
• toolchain/cpudriver.cpp (modified) (3 diffs)
• toolchain/cpudriver.h (modified) (1 diff)
• utf16_encoder.cpp (modified) (1 diff)
• utf8_encoder.cpp (modified) (1 diff)
• wc.cpp (modified) (1 diff)

icGREP/icgrep-devel/icgrep/IR_Gen/CBuilder.cpp

@@ -680 +680 @@
 
 PointerType * LLVM_READNONE CBuilder::getVoidPtrTy(const unsigned AddressSpace) const {
-    return PointerType::get(Type::getVoidTy(getContext()), AddressSpace);
+    //return PointerType::get(Type::getVoidTy(getContext()), AddressSpace);
+    return PointerType::get(Type::getInt8Ty(getContext()), AddressSpace);
 }
 

icGREP/icgrep-devel/icgrep/kernels/lz4/lz4_swizzled_match_copy_kernel.cpp

@@ -335 +335 @@
         , mStreamCount(streamCount) {
 
-    assert((mSwizzleFactor == (kb->getBitBlockWidth() / PDEP_width)) && "swizzle factor must equal bitBlockWidth / PDEP_width");
+    assert((mSwizzleFactor == (iBuilder->getBitBlockWidth() / PDEP_width)) && "swizzle factor must equal bitBlockWidth / PDEP_width");
     assert((mPDEPWidth == 64 || mPDEPWidth == 32) && "PDEP width must be 32 or 64");
 

icGREP/icgrep-devel/icgrep/lz4d_ext_dep.cpp

@@ -23 +23 @@
 #include <kernels/kernel_builder.h>
 #include <toolchain/cpudriver.h>
-
+#include <llvm/Support/raw_ostream.h>
 #include <iostream>
 #include <lz4/LZ4Generator.h>
@@ -57 +57 @@
     LZ4FrameDecoder lz4Frame(fileName);
     if (!lz4Frame.isValid()) {
-        errs() << "Invalid LZ4 file.\n";
+        llvm::errs() << "Invalid LZ4 file.\n";
         return -1;
     }
@@ -65 +65 @@
             boost::filesystem::remove(outputFile);
         } else {
-            errs() << outputFile + " existed. Use -f argument to overwrite.\n";
+            llvm::errs() << outputFile + " existed. Use -f argument to overwrite.\n";
             return -1;
         }

icGREP/icgrep-devel/icgrep/toolchain/cpudriver.cpp

@@ -93 +93 @@
         std::vector<std::string> attrs;
         for (auto &flag : HostCPUFeatures) {
-            auto enabled = flag.second ? "+" : "-";
-            attrs.push_back(enabled + flag.first().str());
+            if (flag.second) {
+                attrs.push_back("+" + flag.first().str());
+            }
         }
         builder.setMAttrs(attrs);
@@ -139 +140 @@
 
 void ParabixDriver::makeKernelCall(Kernel * kernel, const std::vector<StreamSetBuffer *> & inputs, const std::vector<StreamSetBuffer *> & outputs) {
-    assert ("addKernelCall or makeKernelCall was already run on this kernel." && (kernel->getModule() == nullptr));
+    assert ("makeKernelCall was already run on this kernel." && (kernel->getModule() == nullptr));
     mPipeline.emplace_back(kernel);
     kernel->bindPorts(inputs, outputs);
@@ -264 +265 @@
             [&](const std::string &Name) {
                 auto Sym = mCompileLayer->findSymbol(Name, false);
+                if (!Sym) Sym = mCompileLayer->findSymbol(getMangledName(Name), false);
 #if LLVM_VERSION_INTEGER <= LLVM_VERSION_CODE(3, 9, 1)
                 if (Sym) return Sym.toRuntimeDyldSymbol();

icGREP/icgrep-devel/icgrep/toolchain/cpudriver.h

@@ -8 +8 @@
 
 #include <llvm/IR/LegacyPassManager.h>
-#if LLVM_VERSION_INTEGER >= LLVM_VERSION_CODE(3, 9, 0)
+#if LLVM_VERSION_INTEGER >= LLVM_VERSION_CODE(4, 0, 0)
 #define ORCJIT
 #endif

icGREP/icgrep-devel/icgrep/utf16_encoder.cpp

@@ -9 +9 @@
 #include <algorithm>
 #include <stdexcept>
+#include <string>
 
 using namespace UCD;

icGREP/icgrep-devel/icgrep/utf8_encoder.cpp

@@ -9 +9 @@
 #include <algorithm>
 #include <stdexcept>
+#include <string>
 
 using namespace UCD;

icGREP/icgrep-devel/icgrep/wc.cpp

@@ -29 +29 @@
 static cl::OptionCategory wcFlags("Command Flags", "wc options");
 
-static cl::list<std::string> inputFiles(cl::Positional, cl::desc("<input file ...>"), cl::OneOrMore, cl::cat(wcFlags));
+cl::list<std::string> inputFiles(cl::Positional, cl::desc("<input file ...>"), cl::OneOrMore, cl::cat(wcFlags));
 
 enum CountOptions {