Changeset 5448

Timestamp:

May 13, 2017, 11:37:08 AM (2 years ago)

Author:

cameron

Message:

Hack for source/external buffers with mBufferBlocks=1; u8u16 test with segment-pipeline-parallel; simplified copying

Location:

icGREP/icgrep-devel/icgrep

Files:

• CMakeLists.txt (modified) (2 diffs)
• kernels/kernel.cpp (modified) (1 diff)
• kernels/stdout_kernel.cpp (modified) (2 diffs)
• kernels/streamset.cpp (modified) (1 diff)

icGREP/icgrep-devel/icgrep/CMakeLists.txt

@@ -229 +229 @@
 
 add_test(
+  NAME u8u16_multi_test
+  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA/u8u16
+  COMMAND ./run_all ${CMAKE_BINARY_DIR}/u8u16 -segment-size=16 -enable-segment-pipeline-parallel)
+
+add_test(
   NAME lz4d_test
   WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA/lz4d
@@ -245 +250 @@
 add_custom_target (u8u16_test
   WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/../QA/u8u16
-  COMMAND ./run_all ${CMAKE_BINARY_DIR}/u8u16)
+  COMMAND ./run_all "${CMAKE_BINARY_DIR}/u8u16 -segment-size=16 -enable-segment-pipeline-parallel")
 
 add_custom_target (lz4d_test

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

@@ -140 +140 @@
 
     for (unsigned i = 0; i < mStreamSetInputs.size(); i++) {
-        if ((mStreamSetInputBuffers[i]->getBufferBlocks() > 0) && (mStreamSetInputBuffers[i]->getBufferBlocks() < requiredBlocks)) {
+        if ((mStreamSetInputBuffers[i]->getBufferBlocks() > 1) && (mStreamSetInputBuffers[i]->getBufferBlocks() < requiredBlocks)) {
             report_fatal_error(getName() + ": " + mStreamSetInputs[i].name + " requires buffer size " + std::to_string(requiredBlocks));
         }

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

@@ -92 +92 @@
     Value * bytePtr = iBuilder->CreatePointerCast(iBuilder->getInputStreamBlockPtr("codeUnitBuffer", iBuilder->getInt32(0)), i8PtrTy);
     bytePtr = iBuilder->CreateGEP(bytePtr, byteOffset);
-    iBuilder->CreateWriteCall(fileDes, bytePtr, iBuilder->CreateMul(itemsToDo, itemBytes));
+    Value * bytesToDo = mCodeUnitWidth == 8 ? itemsToDo : iBuilder->CreateMul(itemsToDo, itemBytes);
+    iBuilder->CreateWriteCall(fileDes, bytePtr, bytesToDo);
     
     processed = iBuilder->CreateAdd(processed, itemsToDo);
@@ -109 +110 @@
         bytePtr = iBuilder->CreateGEP(bytePtr, byteOffset);
         itemsToDo = iBuilder->CreateSub(available, processed);
-        iBuilder->CreateWriteCall(fileDes, bytePtr, iBuilder->CreateMul(itemsToDo, itemBytes));
+        bytesToDo = mCodeUnitWidth == 8 ? itemsToDo : iBuilder->CreateMul(itemsToDo, itemBytes);
+        iBuilder->CreateWriteCall(fileDes, bytePtr, bytesToDo);
         processed = iBuilder->CreateAdd(processed, itemsToDo);
         iBuilder->setProcessedItemCount("codeUnitBuffer", available);

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

@@ -138 +138 @@
 
 void StreamSetBuffer::createBlockAlignedCopy(IDISA::IDISA_Builder * const iBuilder, Value * targetBlockPtr, Value * sourceBlockPtr, Value * itemsToCopy) const {
-    Type * size_ty = iBuilder->getSizeTy();
     Type * i8ptr = iBuilder->getInt8PtrTy();
+    unsigned alignment = iBuilder->getBitBlockWidth() / 8;
     Constant * blockSize = iBuilder->getSize(iBuilder->getBitBlockWidth());
-    Function * f = iBuilder->GetInsertBlock()->getParent();
-    BasicBlock * wholeBlockCopy = BasicBlock::Create(iBuilder->getContext(), "wholeBlockCopy", f, 0);
-    BasicBlock * partialBlockCopy = BasicBlock::Create(iBuilder->getContext(), "partialBlockCopy", f, 0);
-    BasicBlock * copyDone = BasicBlock::Create(iBuilder->getContext(), "copyDone", f, 0);
     unsigned numStreams = getType()->getArrayNumElements();
     auto elemTy = getType()->getArrayElementType();
     unsigned fieldWidth = isa<ArrayType>(elemTy) ? elemTy->getArrayNumElements() : 1;
+    if (numStreams == 1) {
+        Value * copyBits = iBuilder->CreateMul(itemsToCopy, iBuilder->getSize(fieldWidth));
+        Value * copyBytes = iBuilder->CreateLShr(iBuilder->CreateAdd(copyBits, iBuilder->getSize(7)), iBuilder->getSize(3));
+        iBuilder->CreateMemMove(iBuilder->CreateBitCast(targetBlockPtr, i8ptr), iBuilder->CreateBitCast(sourceBlockPtr, i8ptr), copyBytes, alignment);
+        return;
+    }
     Value * blocksToCopy = iBuilder->CreateUDiv(itemsToCopy, blockSize);
     Value * partialItems = iBuilder->CreateURem(itemsToCopy, blockSize);
     Value * partialBlockTargetPtr = iBuilder->CreateGEP(targetBlockPtr, blocksToCopy);
     Value * partialBlockSourcePtr = iBuilder->CreateGEP(sourceBlockPtr, blocksToCopy);
-    iBuilder->CreateCondBr(iBuilder->CreateICmpUGT(blocksToCopy, iBuilder->getSize(0)), wholeBlockCopy, partialBlockCopy);
-    iBuilder->SetInsertPoint(wholeBlockCopy);
-    unsigned alignment = iBuilder->getBitBlockWidth() / 8;
-    Value * copyLength = iBuilder->CreateSub(iBuilder->CreatePtrToInt(partialBlockTargetPtr, size_ty), iBuilder->CreatePtrToInt(targetBlockPtr, size_ty));
-    iBuilder->CreateMemMove(iBuilder->CreateBitCast(targetBlockPtr, i8ptr), iBuilder->CreateBitCast(sourceBlockPtr, i8ptr), copyLength, alignment);
-    iBuilder->CreateCondBr(iBuilder->CreateICmpUGT(partialItems, iBuilder->getSize(0)), partialBlockCopy, copyDone);
-    iBuilder->SetInsertPoint(partialBlockCopy);
-    Value * copyBits = iBuilder->CreateMul(itemsToCopy, iBuilder->getSize(fieldWidth));
-    Value * copyBytes = iBuilder->CreateLShr(iBuilder->CreateAdd(copyBits, iBuilder->getSize(7)), iBuilder->getSize(3));
+    Value * blockCopyBytes = iBuilder->CreateMul(blocksToCopy, iBuilder->getSize(iBuilder->getBitBlockWidth() * numStreams * fieldWidth/8));
+    iBuilder->CreateMemMove(iBuilder->CreateBitCast(targetBlockPtr, i8ptr), iBuilder->CreateBitCast(sourceBlockPtr, i8ptr), blockCopyBytes, alignment);
+    Value * partialCopyBitsPreStream = iBuilder->CreateMul(partialItems, iBuilder->getSize(fieldWidth));
+    Value * partialCopyBytesPreStream = iBuilder->CreateLShr(iBuilder->CreateAdd(partialCopyBitsPreStream, iBuilder->getSize(7)), iBuilder->getSize(3));
     for (unsigned strm = 0; strm < numStreams; strm++) {
         Value * strmTargetPtr = iBuilder->CreateGEP(partialBlockTargetPtr, {iBuilder->getInt32(0), iBuilder->getInt32(strm)});
         Value * strmSourcePtr = iBuilder->CreateGEP(partialBlockSourcePtr, {iBuilder->getInt32(0), iBuilder->getInt32(strm)});
-        iBuilder->CreateMemMove(iBuilder->CreateBitCast(strmTargetPtr, i8ptr), iBuilder->CreateBitCast(strmSourcePtr, i8ptr), copyBytes, alignment);
-    }
-    iBuilder->CreateBr(copyDone);
-    iBuilder->SetInsertPoint(copyDone);
+        iBuilder->CreateMemMove(iBuilder->CreateBitCast(strmTargetPtr, i8ptr), iBuilder->CreateBitCast(strmSourcePtr, i8ptr), partialCopyBytesPreStream, alignment);
+    }
 }