From 335d36211c13d0167b3e0b3f365a7a1119cc74eb Mon Sep 17 00:00:00 2001
From: Evghenii <egaburov@dds.nl>
Date: Wed, 5 Mar 2014 16:16:51 +0100
Subject: [PATCH] +1

---
 .../inplaceTraspose/inplaceTranspose.cpp         |  2 +-
 .../inplaceTraspose/inplaceTranspose.ispc        | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/examples/portable/inplaceTraspose/inplaceTranspose.cpp b/examples/portable/inplaceTraspose/inplaceTranspose.cpp
index 7e2a00c9..c63bd4f1 100644
--- a/examples/portable/inplaceTraspose/inplaceTranspose.cpp
+++ b/examples/portable/inplaceTraspose/inplaceTranspose.cpp
@@ -112,7 +112,7 @@ int main(int argc, char * argv[])
     for (int i = 0; i < n; i++)
       assert(A[j*n+i].first == j && A[j*n+i].second == i);
 
-  fprintf(stderr, " tranpose done in %g msec :: BW= % GB/s\n", 
+  fprintf(stderr, " tranpose done in %g msec :: BW= %g GB/s\n", 
       dt , 2*m*n*sizeof(int)*2/dt*1e3/1e9);
 
 
diff --git a/examples/portable/inplaceTraspose/inplaceTranspose.ispc b/examples/portable/inplaceTraspose/inplaceTranspose.ispc
index c3b66205..91557ddc 100644
--- a/examples/portable/inplaceTraspose/inplaceTranspose.ispc
+++ b/examples/portable/inplaceTraspose/inplaceTranspose.ispc
@@ -86,7 +86,6 @@ void transpose_serial(uniform T A[], const uniform int m, const uniform int n)
 }
 #endif
 
-static uniform   T * uniform tmpAll = NULL;
 static uniform int * uniform joverb = NULL;
 static uniform int * uniform iovera = NULL;
 static uniform int a,b,c;
@@ -94,8 +93,6 @@ static uniform int a,b,c;
 static 
 void transpose_init(const uniform int m, const uniform int n, const uniform int nTask)
 {
-  const uniform int tmpSize = max(m,n) * programCount * nTask;
-  tmpAll = uniform new uniform T  [tmpSize];
   joverb = uniform new uniform int[n];
   iovera = uniform new uniform int[m];
 
@@ -113,7 +110,6 @@ void transpose_finalize()
 {
   delete iovera;
   delete joverb;
-  delete tmpAll;
 }
 
 task 
@@ -123,7 +119,7 @@ void transpose_step1(uniform T A[], const uniform int m, const uniform int n)
   const uniform int nibeg = taskIndex * n_per_task;
   const uniform int niend = min(nibeg + n_per_task, n);
 
-  uniform  T * uniform tmp = tmpAll + max(m,n)*taskIndex;
+  uniform T * uniform tmp = uniform new uniform T[m];
 
   for (uniform int j = nibeg; j < niend; j++)
   {
@@ -134,6 +130,8 @@ void transpose_step1(uniform T A[], const uniform int m, const uniform int n)
     foreach (i = 0 ... m)
       A[base + i] = tmp[i];
   }
+
+  delete tmp;
 }
 
 task
@@ -143,7 +141,7 @@ void transpose_step2(uniform T A[], const uniform int m, const uniform int n)
   const uniform int mibeg = taskIndex * m_per_task;
   const uniform int miend = min(mibeg + m_per_task, m);
   
-  uniform  T * uniform tmp = tmpAll + max(m,n)*programCount * taskIndex;
+  uniform  T * uniform tmp = uniform new uniform T[n*programCount];
 
   uniform T (*uniform tmp2D)[programCount] = (uniform T (*uniform)[programCount])tmp;
   foreach (i = mibeg ... miend)
@@ -153,6 +151,8 @@ void transpose_step2(uniform T A[], const uniform int m, const uniform int n)
     for (uniform int j = 0; j < n; j++)
       A[j*m + i] = tmp2D[j][programIndex];
   }
+
+  delete tmp;
 }
 
 task
@@ -162,7 +162,7 @@ void transpose_step3(uniform T A[], const uniform int m, const uniform int n)
   const uniform int nibeg = taskIndex * n_per_task;
   const uniform int niend = min(nibeg + n_per_task, n);
   
-  uniform  T * uniform tmp = tmpAll + max(m,n)*taskIndex;
+  uniform  T * uniform tmp = uniform new uniform T[m];
 
   for (uniform int j = nibeg; j < niend; j++)
   {
@@ -172,6 +172,8 @@ void transpose_step3(uniform T A[], const uniform int m, const uniform int n)
     foreach (i = 0 ... m)
       A[base + i] = tmp[i];
   }
+
+  delete tmp;
 }
 
 export