From 900e71e5ccb5eccb9eebe3ac30a42dcc63a74ba0 Mon Sep 17 00:00:00 2001
From: Evghenii <egaburov@dds.nl>
Date: Thu, 30 Jan 2014 11:50:52 +0100
Subject: [PATCH] preprocessing bugfix

---
 examples_ptx/mergeSort/mergeSort.cu   | 5 +++--
 examples_ptx/mergeSort/mergeSort.ispc | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/examples_ptx/mergeSort/mergeSort.cu b/examples_ptx/mergeSort/mergeSort.cu
index 9f3e6793..90297e2b 100644
--- a/examples_ptx/mergeSort/mergeSort.cu
+++ b/examples_ptx/mergeSort/mergeSort.cu
@@ -190,6 +190,7 @@ void mergeSortGangKernel(
     s_val[programIndex + programCount] = srcVal[base + programIndex + programCount];
 
 #if 1
+#pragma unroll 1
     for (uniform int stride = 1; stride < 2*programCount; stride <<= 1)
     {
       const int lPos = programIndex & (stride - 1);
@@ -589,7 +590,7 @@ void mergeSort___export(
     // k20m:  2367 M/s
     mergeSortGang(iKey, iVal, srcKey, srcVal, N/(2*programCount));
 
-#if 1
+#if 0
     for (uniform int stride = 2*programCount; stride < N; stride <<= 1)
     {
       const uniform int lastSegmentElements = N % (2 * stride);
@@ -634,8 +635,8 @@ void mergeSort___export(
         oVal = tmpVal;
       }
     }
-  }
 #endif
+  }
 }
 extern "C"
 void mergeSort(
diff --git a/examples_ptx/mergeSort/mergeSort.ispc b/examples_ptx/mergeSort/mergeSort.ispc
index 10e0f6a2..6746c8bf 100644
--- a/examples_ptx/mergeSort/mergeSort.ispc
+++ b/examples_ptx/mergeSort/mergeSort.ispc
@@ -738,6 +738,6 @@ void mergeSort(
         oVal = tmpVal;
       }
     }
-  }
 #endif
+  }
 }