From 1e5476e573715aee309e2ec1890af5344d008d99 Mon Sep 17 00:00:00 2001 From: Evghenii Date: Tue, 28 Jan 2014 17:19:34 +0100 Subject: [PATCH] +1 --- examples_ptx/radixSort/radixSort.cpp | 2 +- examples_ptx/radixSort/radixSort.ispc | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/examples_ptx/radixSort/radixSort.cpp b/examples_ptx/radixSort/radixSort.cpp index e024cabc..d6a21c79 100644 --- a/examples_ptx/radixSort/radixSort.cpp +++ b/examples_ptx/radixSort/radixSort.cpp @@ -41,7 +41,7 @@ int main (int argc, char *argv[]) #pragma omp parallel for for (int i = 0; i < n; i++) - keys[i] = drand48() * (1<<30); + keys[i] = 10*i; //drand48() * (1<<30); std::random_shuffle(keys, keys + n); diff --git a/examples_ptx/radixSort/radixSort.ispc b/examples_ptx/radixSort/radixSort.ispc index 2e376143..5d092ac8 100644 --- a/examples_ptx/radixSort/radixSort.ispc +++ b/examples_ptx/radixSort/radixSort.ispc @@ -60,7 +60,11 @@ void sortPass( const uniform int blockDim = (numElements + numBlocks - 1) / numBlocks; +#if 0 uniform int * uniform localCounts = sharedCounts + blockIdx*NUMDIGITS; +#else + uniform int localCounts[NUMDIGITS]; +#endif const uniform int keyIndex = blockIdx * blockDim; uniform int * uniform keys = keysAll + keyIndex; @@ -92,7 +96,7 @@ void sortPass( } else { -#ifdef __NVPTX__ +#if 1 //def __NVPTX__ rel = atomic_add_global(&localCounts[key],1); #else rel = atomic_add_local(&localCounts[key],1);