Changeset 5957

Timestamp:

Apr 9, 2018, 5:01:04 PM (13 months ago)

Author:

nmedfort

Message:

fixes for minor compilation issues

Location:

icGREP/icgrep-devel/icgrep

Files:

• grep/grep_engine.cpp (modified) (2 diffs)
• kernels/kernel_builder.cpp (modified) (1 diff)
• kernels/lz4/lz4_block_decoder.cpp (modified) (5 diffs)
• kernels/lz4/lz4_multiple_pdep_kernel.cpp (modified) (3 diffs)
• lz4/LZ4Generator.cpp (modified) (5 diffs)
• lz4/LZ4Generator.h (modified) (1 diff)
• lz4/LZ4GrepGenerator.cpp (modified) (4 diffs)
• lz4/LZ4GrepGenerator.h (modified) (1 diff)
• lz4_grep.cpp (modified) (1 diff)

icGREP/icgrep-devel/icgrep/grep/grep_engine.cpp

@@ -103 +103 @@
     memcpy((void * ) &mBuffer_base[mSpace_used], C_string_ptr, length+1);
     mSpace_used += length+1;
-    assert("Search candidate not null terminated" && (buffer_base[mSpace_used] == '\0'));
+    assert("Search candidate not null terminated" && (mBuffer_base[mSpace_used] == '\0'));
     mEntries++;
 }
@@ -745 +745 @@
     Module * M = idb->getModule();
     
-    const unsigned encodingBits = 8;
     const unsigned segmentSize = codegen::BufferSegments * codegen::SegmentSize * codegen::ThreadNum;
     

icGREP/icgrep-devel/icgrep/kernels/kernel_builder.cpp

@@ -176 +176 @@
     assert (target && targetOffset);
     assert (source && sourceOffset);
-    assert (target->getType() == source->getType());
+    // assert (target->getType() == source->getType());
     assert (target->getType()->isPointerTy());
     assert (isConstantZero(targetOffset) || isConstantZero(sourceOffset));

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

@@ -58 +58 @@
 void LZ4BlockDecoderNewKernel::generateMultiBlockLogic(const std::unique_ptr<KernelBuilder> &iBuilder, Value * const numOfStrides) {
     // Constant
-    Constant* INT8_0 = iBuilder->getInt8(0);
-    Constant* INT8_1 = iBuilder->getInt8(1);
     Constant* INT64_0 = iBuilder->getInt64(0);
-
 
     BasicBlock * entryBlock = iBuilder->GetInsertBlock();
@@ -94 +91 @@
     iBuilder->SetInsertPoint(processCon);
 
-    PHINode* phiIsCompressed = iBuilder->CreatePHI(iBuilder->getInt8Ty(), 3);
-    PHINode* phiBlockStart = iBuilder->CreatePHI(iBuilder->getInt64Ty(), 3);
-    PHINode* phiBlockEnd = iBuilder->CreatePHI(iBuilder->getInt64Ty(), 3);
-    PHINode* sOffset = iBuilder->CreatePHI(iBuilder->getSizeTy(), 3);
+    PHINode* phiIsCompressed = iBuilder->CreatePHI(initIsCompressed->getType(), 3);
+    PHINode* phiBlockStart = iBuilder->CreatePHI(initBlockStart->getType(), 3);
+    PHINode* phiBlockEnd = iBuilder->CreatePHI(initBlockEnd->getType(), 3);
+    PHINode* sOffset = iBuilder->CreatePHI(previousOffset->getType(), 3);
 
     phiIsCompressed->addIncoming(initIsCompressed, entryBlock);
@@ -119 +116 @@
     iBuilder->SetInsertPoint(storeOutputBlock);
     this->appendOutput(iBuilder, phiIsCompressed, phiBlockStart, phiBlockEnd);
-    phiIsCompressed->addIncoming(INT8_0, storeOutputBlock);
+    phiIsCompressed->addIncoming(iBuilder->getFalse(), storeOutputBlock);
     phiBlockStart->addIncoming(INT64_0, storeOutputBlock);
     phiBlockEnd->addIncoming(INT64_0, storeOutputBlock);
@@ -177 +174 @@
 
     sOffset->addIncoming(newOffset, iBuilder->GetInsertBlock());
-    phiIsCompressed->addIncoming(iBuilder->CreateSelect(isCompressed, INT8_1, INT8_0), iBuilder->GetInsertBlock());
+    phiIsCompressed->addIncoming(isCompressed, iBuilder->GetInsertBlock());
     phiBlockStart->addIncoming(blockStart, iBuilder->GetInsertBlock());
     phiBlockEnd->addIncoming(blockEnd, iBuilder->GetInsertBlock());
@@ -204 +201 @@
     void LZ4BlockDecoderNewKernel::appendOutput(const std::unique_ptr<KernelBuilder> & iBuilder, Value* isCompressed, Value* blockStart, Value* blockEnd) {
         // Constant
-        this->generateStoreNumberOutput(iBuilder, "isCompressed", iBuilder->getInt8Ty()->getPointerTo(), isCompressed);
+        this->generateStoreNumberOutput(iBuilder, "isCompressed", iBuilder->getInt1Ty()->getPointerTo(), isCompressed);
         this->generateStoreNumberOutput(iBuilder, "blockStart", iBuilder->getInt64Ty()->getPointerTo(), blockStart);
         this->generateStoreNumberOutput(iBuilder, "blockEnd", iBuilder->getInt64Ty()->getPointerTo(), blockEnd);

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

@@ -30 +30 @@
         mStreamSetOutputs.push_back(Binding{kb->getStreamSetTy(streamCount), "outputStreamSet0", RateEqualTo("PDEPmarkerStream")});
 
-        for (int i = 1; i < streamSize; i++) {
+        for (unsigned i = 1; i < streamSize; i++) {
             mStreamSetInputs.push_back(Binding{kb->getStreamSetTy(streamCount), "sourceStreamSet" + std::to_string(i), BoundedRate(0, 1), Swizzled()});
             mStreamSetOutputs.push_back(Binding{kb->getStreamSetTy(streamCount), "outputStreamSet" + std::to_string(i), RateEqualTo("outputStreamSet0")});
@@ -106 +106 @@
             Value * shift_amount = kb->CreateURem(updatedProcessedSourceBits, pdepWidth);
 
-            for (int iStreamIndex = 0; iStreamIndex < mStreamSize; iStreamIndex++) {
+            for (unsigned iStreamIndex = 0; iStreamIndex < mStreamSize; iStreamIndex++) {
                 Value * next_blk_idx = kb->CreateSub(kb->CreateUDiv(ahead_pdep_width_less_1, blockWidth), base_src_blk_idx);
                 Value * next_swizzle_idx = kb->CreateUDiv(kb->CreateURem(ahead_pdep_width_less_1, blockWidth), pdepWidth);
@@ -166 +166 @@
 
         kb->SetInsertPoint(terminate);
-        for (int i = 0; i < mStreamSize; i++) {
+        for (unsigned i = 0; i < mStreamSize; i++) {
             kb->setProcessedItemCount("sourceStreamSet" + std::to_string(i), updatedProcessedSourceBitsPhi);
         }

icGREP/icgrep-devel/icgrep/lz4/LZ4Generator.cpp

@@ -90 +90 @@
 
     StreamSetBuffer * const DecompressedByteStream = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(1, 8), this->getDecompressedBufferBlocks());
-    StreamSetBuffer * const FinalDecompressedByteStream = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(1, 8), this->getDecompressedBufferBlocks());
 
     // GeneratePipeline
@@ -223 +222 @@
     //// Generate Helper Markers Extenders, FX, XF
     StreamSetBuffer * const Extenders = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(1, 1), this->getInputBufferBlocks());
-    StreamSetBuffer * const CC_0xFX = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(1, 1), this->getInputBufferBlocks());
-    StreamSetBuffer * const CC_0xXF = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(1, 1), this->getInputBufferBlocks());
-
 
     Kernel * extenderK = pxDriver.addKernelInstance<ParabixCharacterClassKernelBuilder>(iBuilder, "extenders", std::vector<re::CC *>{re::makeCC(0xFF)}, 8);
@@ -235 +231 @@
     blockDecoderK->setInitialArguments({iBuilder->CreateTrunc(hasBlockChecksum, iBuilder->getInt1Ty()), headerSize, fileSize});
     pxDriver.makeKernelCall(blockDecoderK, {ByteStream}, {BlockData_IsCompressed, BlockData_BlockStart, BlockData_BlockEnd});
-
-//    re::CC* xfCC = re::makeCC(0x0f);
-//    re::CC* fxCC = re::makeCC(0xf0);
-//    for (re::codepoint_t i = 1; i <= 0xf; i++) {
-//        xfCC = re::makeCC(xfCC, re::makeCC(i * 0x10 + 0x0f));
-//        fxCC = re::makeCC(fxCC, re::makeCC(0xf0 + i));
-//    }
-
-//    Kernel * CC_0xFXKernel = pxDriver.addKernelInstance<ParabixCharacterClassKernelBuilder>(iBuilder, "CC_0xFX", std::vector<re::CC *>{fxCC}, 8);
-//    pxDriver.makeKernelCall(CC_0xFXKernel, {BasisBits}, {CC_0xFX});
-
-//    Kernel * CC_0xXFKernel = pxDriver.addKernelInstance<ParabixCharacterClassKernelBuilder>(iBuilder, "CC_0xXF", std::vector<re::CC *>{xfCC}, 8);
-//    pxDriver.makeKernelCall(CC_0xXFKernel, {BasisBits}, {CC_0xXF});
 
     //// Generate Extract/Deposit Markers, M0_Start, M0_End, MatchOffset
@@ -263 +246 @@
     DepositMarker = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(1, 1), this->getDecompressedBufferBlocks());
     Match_Offset = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(1, 64), this->getInputBufferBlocks());
-
-
-
 
     Kernel* Lz4IndexBuilderK = pxDriver.addKernelInstance<LZ4IndexBuilderKernel>(iBuilder);
@@ -274 +254 @@
                     ByteStream,
                     Extenders,
-//                    CC_0xFX,
-//                    CC_0xXF,
 
                     // Block Data

icGREP/icgrep-devel/icgrep/lz4/LZ4Generator.h

@@ -32 +32 @@
 protected:
     //// Protected Method
-    inline void generateMainFunc(const std::unique_ptr<kernel::KernelBuilder> & iBuilder);
+    void generateMainFunc(const std::unique_ptr<kernel::KernelBuilder> & iBuilder);
     // Pipeline
     virtual void generateLoadByteStreamAndBitStream(const std::unique_ptr<kernel::KernelBuilder> & iBuilder);

icGREP/icgrep-devel/icgrep/lz4/LZ4GrepGenerator.cpp

@@ -141 +141 @@
     // TODO: until we automate stream buffer sizing, use this calculation to determine how large our matches buffer needs to be.
     const unsigned baseBufferSize = this->getInputBufferBlocks();
-    const unsigned encodingBits = 8;
     bool MultithreadedSimpleRE = false;
-    bool PabloTransposition = false;
     bool PropertyKernels = false;
     bool CC_Multiplexing = false;
@@ -338 +336 @@
     return std::pair<StreamSetBuffer *, StreamSetBuffer *>(LineBreakStream, Matches);
 
-};
+}
 
 
@@ -350 +348 @@
     main(fileBuffer, blockStart, blockEnd, hasBlockChecksum, reinterpret_cast<intptr_t>(&accum));
     llvm::outs() << s.str();
-};
+}
 
 void LZ4GrepGenerator::generateScanMatchGrepPipeline(re::RE* regex) {
@@ -425 +423 @@
     auto & iBuilder = pxDriver.getBuilder();
     this->generateMainFunc(iBuilder);
-
-    StreamSetBuffer * const DecompressedByteStream = pxDriver.addBuffer<CircularBuffer>(iBuilder, iBuilder->getStreamSetTy(1, 8), this->getDecompressedBufferBlocks());
 
     // GeneratePipeline

icGREP/icgrep-devel/icgrep/lz4/LZ4GrepGenerator.h

@@ -14 +14 @@
 #include <sstream>
 #include <atomic>
-#import <grep/grep_engine.h>
+#include <grep/grep_engine.h>
 
 typedef void (*ScanMatchGrepMainFunctionType)(char * byte_data, size_t headerSize, size_t filesize, bool hasBlockChecksum, intptr_t match_accumulator);

icGREP/icgrep-devel/icgrep/lz4_grep.cpp

@@ -87 +87 @@
     // Since mmap offset has to be multiples of pages, we can't use it to skip headers.
     mappedFile.open(fileName , lz4Frame.getBlocksLength() + lz4Frame.getBlocksStart());
-    size_t headerLength = lz4Frame.getBlocksStart();
     //char *fileBuffer = const_cast<char *>(mappedFile.data()) + lz4Frame.getBlocksStart();
     char *fileBuffer = const_cast<char *>(mappedFile.data());