bones-compiler 1.3.1 → 1.6.0

data/examples/element/example05.c

@@ -8,15 +8,15 @@
 // Web address........http://parse.ele.tue.nl/bones/
 //
 // == File information
-// Filename...........element/example5.c
+// Filename...........element/example05.c
 // Author.............Cedric Nugteren
-// Last modified on...16-April-2012
+// Last modified on...10-October-2014
 //
 
 #include <stdio.h>
 #define SIZE 2311
 
-// This is 'example5', demonstrating multiple inputs and outputs of different types
+// This is 'example05', demonstrating multiple inputs and outputs of different types
 int main(void) {
 	int i;
 	float result = 0;
@@ -36,9 +36,11 @@ int main(void) {
 	}
 	
 	// Perform the computation
-	#pragma species kernel 0:SIZE-1|element ^ 0:SIZE-1|element ^ 0:SIZE-1|element -> 0:SIZE-1|element ^ 0:SIZE-1|element
+	#pragma scop
+	#pragma species kernel in3[0:SIZE-1]|element ^ in2[0:SIZE-1]|element ^ in1[0:SIZE-1]|element -> out1[0:SIZE-1]|element ^ out2[0:SIZE-1]|element
 	for(i=0;i<SIZE;i++) {
-		if (in3[i] > 50) {
+		float i3 = in3[i];
+		if (i3 > 50) {
 			result = in2[i] / in1[i];
 		}
 		else {
@@ -48,6 +50,7 @@ int main(void) {
 		out2[i] = in3[i]/255.0;
 	}
 	#pragma species endkernel example5
+	#pragma endscop
 	
 	// Clean-up and exit the function
 	fflush(stdout);

data/examples/element/example06.c

@@ -8,15 +8,15 @@
 // Web address........http://parse.ele.tue.nl/bones/
 //
 // == File information
-// Filename...........element/example6.c
+// Filename...........element/example06.c
 // Author.............Cedric Nugteren
-// Last modified on...16-April-2012
+// Last modified on...10-October-2014
 //
 
 #include <stdio.h>
 #include <stdlib.h>
 
-// This is 'example6', demonstrating dynamically sized arrays, a dynamically sized kernel, and a classification including variables
+// This is 'example06', demonstrating dynamically sized arrays, a dynamically sized kernel, and a classification including variables
 int main(void) {
 	int i;
 	int N = 2048*2048;
@@ -31,11 +31,13 @@ int main(void) {
 	}
 	
 	// Perform the computation
-	#pragma species kernel 0:N-1|element -> 0:N-1|element
+	#pragma scop
+	#pragma species kernel A[0:N-1]|element -> B[0:N-1]|element
 	for(i=0;i<N;i++) {
 		B[i] = A[i] + 3;
 	}
 	#pragma species endkernel example6
+	#pragma endscop
 	
 	// Clean-up and exit the function
 	free(A);

data/examples/element/example07.c

@@ -8,14 +8,14 @@
 // Web address........http://parse.ele.tue.nl/bones/
 //
 // == File information
-// Filename...........element/example7.c
+// Filename...........element/example07.c
 // Author.............Cedric Nugteren
-// Last modified on...16-April-2012
+// Last modified on...10-October-2014
 
 #include <stdio.h>
 #include <stdlib.h>
 
-// This is 'example7', demonstrating variable length arrays (C99 VLAs)
+// This is 'example07', demonstrating variable length arrays (C99 VLAs)
 int main(void) {
 	int a,b,c;
 	int dim_1A = 50;
@@ -37,7 +37,8 @@ int main(void) {
 	}
 	
 	// Perform the computation
-	#pragma species kernel 0:dim_1A-1,0:dim_1B-1,0:29|element ^ 0:dim_1A-1,0:dim_1B-1,0:29|element -> 0:dim_1A-1,0:dim_1B-1,0:29|element
+	#pragma scop
+	#pragma species kernel in1[0:dim_1A-1,0:dim_1B-1,0:29]|element ^ in2[0:dim_1A-1,0:dim_1B-1,0:29]|element -> out[0:dim_1A-1,0:dim_1B-1,0:29]|element
 	for(a=0;a<dim_1A;a++) {
 		for(b=0;b<dim_1B;b++) {
 			for(c=0;c<30;c++) {
@@ -46,6 +47,7 @@ int main(void) {
 		}
 	}
 	#pragma species endkernel example7
+	#pragma endscop
 	
 	// Clean-up and exit the function
 	fflush(stdout);

data/examples/element/example08.c

@@ -8,14 +8,14 @@
 // Web address........http://parse.ele.tue.nl/bones/
 //
 // == File information
-// Filename...........element/example8.c
+// Filename...........element/example08.c
 // Author.............Cedric Nugteren
-// Last modified on...16-April-2012
+// Last modified on...10-October-2014
 //
 
 #include <stdio.h>
 
-// This is 'example8', demonstrating a reading and writing from the same array
+// This is 'example08', demonstrating a reading and writing from the same array
 int main(void) {
 	int i,j;
 	
@@ -30,13 +30,15 @@ int main(void) {
 	}
 	
 	// Perform the computation
-	#pragma species kernel 0:99,0:15|element -> 0:99,0:15|element
+	#pragma scop
+	#pragma species kernel A[0:99,0:15]|element -> A[0:99,0:15]|element
 	for(i=0;i<100;i++) {
 		for(j=0;j<16;j++) {
 			A[i][j] = 2*A[i][j];
 		}
 	}
 	#pragma species endkernel example8
+	#pragma endscop
 	
 	// Clean-up and exit the function
 	fflush(stdout);

data/examples/element/example09.c

@@ -8,15 +8,15 @@
 // Web address........http://parse.ele.tue.nl/bones/
 //
 // == File information
-// Filename...........element/example9.c
+// Filename...........element/example09.c
 // Author.............Cedric Nugteren
-// Last modified on...16-April-2012
+// Last modified on...10-October-2014
 //
 
 #include <stdio.h>
 #include <stdlib.h>
 
-// This is 'example9', demonstrating a for-loop that does not start at zero
+// This is 'example09', demonstrating a for-loop that does not start at zero
 int main(void) {
 	int i;
 	int result;
@@ -32,12 +32,14 @@ int main(void) {
 	}
 	
 	// Perform the computation
-	#pragma species kernel 2:N-1|element -> 2:N-1|element
+	#pragma scop
+	#pragma species kernel A[2:N-1]|element -> B[2:N-1]|element
 	for(i=2;i<N;i++) {
 		result = A[i] + 3;
 		B[i] = result * 3;
 	}
 	#pragma species endkernel example9
+	#pragma endscop
 	
 	// Clean-up and exit the function
 	free(A);

data/examples/element/example10.c

@@ -10,7 +10,7 @@
 // == File information
 // Filename...........element/example10.c
 // Author.............Cedric Nugteren
-// Last modified on...16-April-2012
+// Last modified on...10-October-2014
 //
 
 #include <stdio.h>
@@ -35,13 +35,15 @@ int main(void) {
 	}
 	
 	// Perform the computation
-	#pragma species kernel 2:N-1,1:M-1|element -> 2:N-1,1:M-1|element
+	#pragma scop
+	#pragma species kernel A[2:N-1,1:M-1]|element -> B[2:N-1,1:M-1]|element
 	for(i=2;i<N;i++) {
 		for(j=1;j<M;j++) {
 			B[i][j] = A[i][j];
 		}
 	}
 	#pragma species endkernel
+	#pragma endscop
 	
 	// Clean-up and exit the function
 	fflush(stdout);

data/examples/element/example11.c

@@ -10,7 +10,7 @@
 // == File information
 // Filename...........element/example11.c
 // Author.............Cedric Nugteren
-// Last modified on...16-April-2012
+// Last modified on...10-October-2014
 //
 
 #include <stdio.h>
@@ -32,13 +32,15 @@ int main(void) {
 	}
 	
 	// Perform the computation
+	#pragma scop
 	for(i=0;i<128;i++) {
-		#pragma species kernel i:i,i:127|element -> i:i,i:127|element
+		#pragma species kernel A[i:i,i:127]|element -> B[i:i,i:127]|element
 		for(j=i;j<128;j++) {
 			B[i][j] = 2*A[i][j];
 		}
 		#pragma species endkernel example11
 	}
+	#pragma endscop
 	
 	// Clean-up and exit the function
 	fflush(stdout);

data/examples/element/example12.c

@@ -10,7 +10,7 @@
 // == File information
 // Filename...........element/example12.c
 // Author.............Cedric Nugteren
-// Last modified on...06-Aug-2012
+// Last modified on...10-October-2014
 //
 
 #include <stdio.h>
@@ -48,9 +48,11 @@ void computation(int* A, int* B, int constant) {
 	int i;
 	
 	// Perform the computation
-	#pragma species kernel 0:127|element -> 0:127|element
+	#pragma scop
+	#pragma species kernel A[0:127]|element -> B[0:127]|element
 	for(i=0;i<128;i++) {
 		B[i] = 2*A[i] + constant;
 	}
 	#pragma species endkernel example12
+	#pragma endscop
 }

data/examples/element/example13.c

@@ -10,7 +10,7 @@
 // == File information
 // Filename...........element/example13.c
 // Author.............Cedric Nugteren
-// Last modified on...07-May-2013
+// Last modified on...10-October-2014
 //
 
 #include <stdio.h>
@@ -39,6 +39,7 @@ int main(void) {
 	}
 	
 	// Perform the computation
+	#pragma scop
 	#pragma species kernel C[0:N-1]|element -> B[11:N-1]|element ^ A[0:5]|element
 	for (i=0; i<N; i++) {
 		if (i > 10) {
@@ -65,6 +66,7 @@ int main(void) {
 		}
 	}
 	#pragma species endkernel example13_k3
+	#pragma endscop
 	
 	// Clean-up and exit the function
 	fflush(stdout);

data/examples/fusion/example01.c

@@ -10,7 +10,7 @@
 // == File information
 // Filename...........fusion/example01.c
 // Author.............Cedric Nugteren
-// Last modified on...09-July-2013
+// Last modified on...11-October-2014
 //
 
 #include <stdio.h>
@@ -34,6 +34,7 @@ int main(void) {
 	}
 	
 	// Perform the computation
+	#pragma scop
 	#pragma species kernel A[0:N-1,0:M-1]|element -> B[0:N-1,0:M-1]|element
 	for(i=0;i<N;i++) {
 		for(j=0;j<M;j++) {
@@ -48,17 +49,7 @@ int main(void) {
 		}
 	}
 	#pragma species endkernel example01-part2
-	
-	/*
-	#pragma species kernel A[0:N-1,0:M-1]|element -> B[0:N-1,0:M-1]|element ^ C[0:N-1,0:M-1]|element
-	for(i=0;i<N;i++) {
-		for(j=0;j<M;j++) {
-			B[i][j] = 2*A[i][j];
-			C[i][j] = 8*B[i][j];
-		}
-	}
-	#pragma species endkernel example01-fused
-	*/
+	#pragma endscop
 	
 	// Clean-up and exit the function
 	fflush(stdout);

data/examples/fusion/example02.c

@@ -10,7 +10,7 @@
 // == File information
 // Filename...........fusion/example02.c
 // Author.............Cedric Nugteren
-// Last modified on...09-July-2013
+// Last modified on...11-October-2014
 //
 
 #include <stdio.h>
@@ -35,6 +35,7 @@ int main(void) {
 	}
 	
 	// Perform the computation
+	#pragma scop
 	#pragma species kernel A[0:N-1,10:M-1]|element -> B[0:N-1,10:M-1]|element
 	for(i=0;i<N;i++) {
 		for(j=10;j<M;j++) {
@@ -49,21 +50,7 @@ int main(void) {
 		}
 	}
 	#pragma species endkernel example02-part2
-	
-	/*
-	#pragma species kernel A[0:N-1,0:M-1]|element -> B[0:N-1,0:M-1]|element ^ C[0:N-1,0:M-1]|element
-	for(i=0;i<MAX(N,M);i++) {
-		for(j=0;j<M;j++) {
-			if (j >= 10 && i < N) {
-				B[i][j] = A[i][j] + 3;
-			}
-			if (i < M) {
-				C[i][j] = -9*A[i][j];
-			}
-		}
-	}
-	#pragma species endkernel example02-fused
-	*/
+	#pragma endscop
 	
 	// Clean-up and exit the function
 	fflush(stdout);

data/examples/fusion/example03.c

@@ -10,7 +10,7 @@
 // == File information
 // Filename...........fusion/example03.c
 // Author.............Cedric Nugteren
-// Last modified on...02-Oct-2013
+// Last modified on...11-October-2014
 //
 
 #include <stdio.h>
@@ -37,6 +37,7 @@ int main(void) {
 	for (i=0; i<2048; i++) { for (j=0; j<2048; j++) { D[i][j] = ((float) i*(j+2)) / 2048; } }
 	
 	// Perform the computation (E := alpha*A*B*C + beta*D)
+	#pragma scop
 	#pragma species copyin A[0:2047,0:2047]|0 ^ B[0:2047,0:2047]|0 ^ D[0:2047,0:2047]|1 ^ C[0:2047,0:2047]|1
 	#pragma species sync 0
 	#pragma species kernel A[0:2047,0:2047]|chunk(0:0,0:2047) ^ B[0:2047,0:2047]|chunk(0:2047,0:0) -> tmp[0:2047,0:2047]|element
@@ -63,6 +64,7 @@ int main(void) {
 	#pragma species endkernel example03-part2
 	#pragma species copyout D[0:2047,0:2047]|2
 	#pragma species sync 2
+	#pragma endscop
 	
 	// Clean-up and exit the function
 	fflush(stdout);

data/examples/fusion/example04.c

@@ -10,7 +10,7 @@
 // == File information
 // Filename...........fusion/example04.c
 // Author.............Cedric Nugteren
-// Last modified on...02-Oct-2013
+// Last modified on...11-October-2014
 //
 
 #include <stdio.h>
@@ -36,7 +36,8 @@ int main(void) {
 	}
 	
 	// Perform the computation (y := A'Ax)
-	#pragma species kernel 0:4095,0:4095|chunk(0:0,0:4095) ^ 0:4095|full -> 0:4095|element
+	#pragma scop
+	#pragma species kernel A[0:4095,0:4095]|chunk(0:0,0:4095) ^ x[0:4095]|full -> tmp[0:4095]|element
 	for (i=0; i<4096; i++) {
 		tmp[i] = 0;
 		for (j=0; j<4096; j++) {
@@ -44,7 +45,7 @@ int main(void) {
 		}
 	}
 	#pragma species endkernel atax-part1
-	#pragma species kernel 0:4095,0:4095|chunk(0:4095,0:0) ^ 0:4095|full -> 0:4095|element
+	#pragma species kernel A[0:4095,0:4095]|chunk(0:4095,0:0) ^ tmp[0:4095]|full -> y[0:4095]|element
 	for (j=0; j<4096; j++) {
 		y[j] = 0;
 		for (i=0; i<4096; i++) {
@@ -52,6 +53,7 @@ int main(void) {
 		}
 	}
 	#pragma species endkernel atax-part2
+	#pragma endscop
 	
 	// Clean-up and exit the function
 	fflush(stdout);

data/examples/fusion/example05.c

@@ -10,7 +10,7 @@
 // == File information
 // Filename...........fusion/example05.c
 // Author.............Cedric Nugteren
-// Last modified on...08-October-2013
+// Last modified on...11-October-2014
 //
 
 #include <stdio.h>
@@ -32,6 +32,7 @@ int main(void) {
 	}
 	
 	// Perform the computation
+	#pragma scop
 	#pragma species kernel A[0:2047,0:1023]|element -> B[0:2047,0:1023]|element
 	for(i=0;i<2048;i++) {
 		for(j=0;j<1024;j++) {
@@ -46,6 +47,7 @@ int main(void) {
 		}
 	}
 	#pragma species endkernel example05-part2
+	#pragma endscop
 	
 	// Clean-up and exit the function
 	fflush(stdout);

data/examples/neighbourhood/example01.c

@@ -8,16 +8,16 @@
 // Web address........http://parse.ele.tue.nl/bones/
 //
 // == File information
-// Filename...........neighbourhood/example1.c
+// Filename...........neighbourhood/example01.c
 // Author.............Cedric Nugteren
-// Last modified on...16-April-2012
+// Last modified on...10-October-2014
 //
 
 #include <stdio.h>
 #define SIZE 60000
 #define NB 2
 
-// This is 'example1', demonstrating a basic 1D neighbourhood-based computation whose size is set by a define
+// This is 'example01', demonstrating a basic 1D neighbourhood-based computation whose size is set by a define
 int main(void) {
 	int i,n;
 	float result = 0;
@@ -32,7 +32,8 @@ int main(void) {
 	}
 	
 	// Perform the computation
-	#pragma species kernel 0:SIZE-1|neighbourhood(-NB:NB) -> 0:SIZE-1|element
+	#pragma scop
+	#pragma species kernel A[0:SIZE-1]|neighbourhood(-NB:NB) -> B[0:SIZE-1]|element
 	for(i=0;i<SIZE;i++) {
 		if (i >= NB && i < SIZE-NB) {
 			result = 0;
@@ -46,6 +47,7 @@ int main(void) {
 		}
 	}
 	#pragma species endkernel example1
+	#pragma endscop
 	
 	// Clean-up and exit the function
 	fflush(stdout);