Changeset 4729

Timestamp:

Aug 17, 2015, 1:13:09 PM (4 years ago)

Author:

cameron

Message:

Bug fix for SequentialFullyPackedStrategy?

File:

• icGREP/icgrep-devel/icgrep/pablo/carry_manager.cpp (modified) (4 diffs)

icGREP/icgrep-devel/icgrep/pablo/carry_manager.cpp

@@ -47 +47 @@
     unsigned scopeCount = doScopeCount(pb);
     mCarryInfoVector.resize(scopeCount);
-    unsigned totalCarryDataSize = enumerate(pb, 0, 0);
-    
-    unsigned totalPackCount = (totalCarryDataSize + mITEMS_PER_PACK - 1)/mITEMS_PER_PACK;
-
-    mCarryPackPtr.resize(totalPackCount);
-    mCarryInPack.resize(totalPackCount);
-    mCarryOutPack.resize(totalPackCount);
-    for (auto i = 0; i < totalPackCount; i++) mCarryInPack[i]=nullptr;
-
     if (Strategy == SequentialFullyPackedStrategy) {
         mPACK_SIZE = 64;
@@ -62 +53 @@
         mZeroInitializer = mBuilder->getInt64(0);
         mOneInitializer = mBuilder->getInt64(-1);
-        mTotalCarryDataBitBlocks = (totalCarryDataSize + BLOCK_SIZE - 1)/BLOCK_SIZE;
-        
     }
     else {
@@ -69 +58 @@
         mITEMS_PER_PACK = 1;
         mCarryPackType = mBitBlockType;
+    }
+    unsigned totalCarryDataSize = enumerate(pb, 0, 0);
+    
+    unsigned totalPackCount = (totalCarryDataSize + mITEMS_PER_PACK - 1)/mITEMS_PER_PACK;
+
+    mCarryPackPtr.resize(totalPackCount);
+    mCarryInPack.resize(totalPackCount);
+    mCarryOutPack.resize(totalPackCount);
+    for (auto i = 0; i < totalPackCount; i++) mCarryInPack[i]=nullptr;
+
+    if (Strategy == SequentialFullyPackedStrategy) {
+        mTotalCarryDataBitBlocks = (totalCarryDataSize + BLOCK_SIZE - 1)/BLOCK_SIZE;       
+    }
+    else {
         mTotalCarryDataBitBlocks = totalCarryDataSize;
     }
@@ -580 +583 @@
             carry_summary = mCarryOutPack[localCarryIndex];
             for (auto i = 1; i < localCarryPacks; i++) {
-                //carry_summary = mBuilder->CreateOr(carry_summary, mPabloBlock->mCarryOutPack[i]);            
                 carry_summary = mBuilder->CreateOr(carry_summary, mCarryOutPack[localCarryIndex+i]);
             }