aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some fixes

Browse Source
This commit is contained in:
Evghenii
2014-01-30 11:32:27 +01:00
parent eb57852f2e
commit e93c2b88ba
4 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
examples_ptx/mergeSort/mergeSort.ispc
View File

@@ -387,6 +387,7 @@ void mergeRanksAndIndices(
}
#if 0
static inline
void merge(
int &dstPosA,
@@ -404,6 +405,7 @@ void merge(
if (programIndex < lenB)
dstPosB = binarySearchInclusive1(keyB, keyA, lenA, nPowTwoLenA) + programIndex;
}
#endif
#if 0
@@ -548,12 +550,9 @@ void mergeElementaryIntervalsKernel(
valB = srcVal[segmentBase + stride + startSrcB + programIndex];
}
int dstPosA, dstPosB;
// Compute destination addresses for merge data
if (programIndex < lenSrcA)
dstPosA = binarySearchExclusive1(keyA, keyB, lenSrcB, SAMPLE_STRIDE) + programIndex;
if (programIndex < lenSrcB)
dstPosB = binarySearchInclusive1(keyB, keyA, lenSrcA, SAMPLE_STRIDE) + programIndex;
int dstPosA = binarySearchExclusive1(keyA, keyB, lenSrcB, SAMPLE_STRIDE) + programIndex;
int dstPosB = binarySearchInclusive1(keyB, keyA, lenSrcA, SAMPLE_STRIDE) + programIndex;
int dstA = -1, dstB = -1;