This commit is contained in:
Evghenii
2014-01-06 11:50:18 +01:00
parent 27d957f0cb
commit 774e907ecf
13 changed files with 850 additions and 6 deletions

View File

@@ -170,9 +170,8 @@ task void bumpup (uniform int h[], uniform int g[])
}
}
static void prefix_sum (uniform int num, uniform int h[])
static void prefix_sum (uniform int num, uniform int h[], uniform int g[])
{
uniform int * uniform g = uniform new uniform int [num+1];
uniform int i;
launch[num] addup (h, g+1);
@@ -183,10 +182,9 @@ static void prefix_sum (uniform int num, uniform int h[])
launch[num] bumpup (h, g);
sync;
delete g;
}
export void sort_ispc (uniform int n, uniform unsigned int code[], uniform int order[], uniform int ntasks)
export void sort_ispc(uniform int n, uniform unsigned int code[], uniform int order[], uniform int ntasks)
{
uniform int num = ntasks ; //< 1 ? num_cores () : ntasks;
uniform int span = n / num;
@@ -194,6 +192,7 @@ export void sort_ispc (uniform int n, uniform unsigned int code[], uniform int o
uniform int * uniform hist = uniform new uniform int [hsize];
uniform int64 * uniform pair = uniform new uniform int64 [n];
uniform int64 * uniform temp = uniform new uniform int64 [n];
uniform int * uniform g = uniform new uniform int [num+1];
uniform int pass, i;
#if DEBUG
@@ -213,7 +212,7 @@ export void sort_ispc (uniform int n, uniform unsigned int code[], uniform int o
launch[num] histogram (span, n, pair, pass, hist);
sync;
prefix_sum (num, hist);
prefix_sum (num, hist,g);
launch[num] permutation (span, n, pair, pass, hist, temp);
sync;
@@ -246,4 +245,5 @@ export void sort_ispc (uniform int n, uniform unsigned int code[], uniform int o
delete hist;
delete pair;
delete temp;
delete g;
}