vx_spawn_warps redesign using opencl's style scheduler

runtime/tests/dev/vx_dev_main.c

@@ -33,21 +33,10 @@ unsigned z[] = {0, 0, 0, 0,
                 0, 0, 0, 0,
                 0, 0, 0, 0};
 
-void mat_add_kernel(void * void_arguments)
+void mat_add_kernel(int task_id, void * void_arguments)
 {
 	mat_add_args_t * arguments = (mat_add_args_t *) void_arguments;
-
-	unsigned wid = vx_warp_id();
-	unsigned tid = vx_thread_id();
-
-	bool valid = (wid < arguments->numRows) && (tid < arguments->numColums);
-
-	__if (valid)
-	{
-		unsigned index = (wid * arguments->numColums) + tid;
-		arguments->z[index] = arguments->x[index] + arguments->y[index];
-	}
-	__endif
+	arguments->z[task_id] = arguments->x[task_id] + arguments->y[task_id];
 }
 
 void vx_print_mat(unsigned * matPtr, int numRows, int numCols)
@@ -62,15 +51,11 @@ void vx_print_mat(unsigned * matPtr, int numRows, int numCols)
 	}
 }
 
-int main()
-{
-	// Main is called with all threads active of warp 0
-	vx_tmc(1);
-
+int main() {
 	// void * hellp = malloc(4);
 	vx_printf("Confirm Dev Main\n");
 
-	vx_printf("vx_spawn_warps\n");
+	vx_printf("vx_spawn_tasks\n");
 
 	mat_add_args_t arguments;
 	arguments.x         = x;
@@ -79,12 +64,8 @@ int main()
 	arguments.numColums = 4;
 	arguments.numRows   = 4;
 
-
-	int numWarps   = 4;
-	int numThreads = 4;
-
 	// First kernel call
-	vx_spawn_warps(numWarps, numThreads, mat_add_kernel, &arguments);
+	vx_spawn_tasks(arguments.numRows * arguments.numColums, mat_add_kernel, &arguments);
 	vx_print_mat(z, arguments.numRows, arguments.numColums);
 
 
@@ -95,8 +76,9 @@ int main()
 	arguments.numRows   = 4;
 
 	// Second Kernel Call
-	vx_spawn_warps(numWarps, numThreads, mat_add_kernel, &arguments);
+	vx_spawn_tasks(arguments.numRows * arguments.numColums, mat_add_kernel, &arguments);
 	vx_print_mat(z, arguments.numRows, arguments.numColums);
+	
 	vx_prints("Passed!\n");
 
 	return 0;

runtime/tests/hello/hello.dump

@@ -68,7 +68,7 @@ Disassembly of section .text:
 800000c0:	7f000117          	auipc	sp,0x7f000
 800000c4:	f4010113          	addi	sp,sp,-192 # ff000000 <__stack_top>
 800000c8:	40000593          	li	a1,1024
-800000cc:	cc202673          	csrr	a2,0xcc2
+800000cc:	cc102673          	csrr	a2,0xcc1
 800000d0:	02c585b3          	mul	a1,a1,a2
 800000d4:	40b10133          	sub	sp,sp,a1
 800000d8:	cc3026f3          	csrr	a3,0xcc3

runtime/tests/hello/hello.hex

@@ -11,7 +11,7 @@
 :1000900093070000638807003705008013054513A8
 :1000A0006F00C00467800000130500006B000500AE
 :1000B000732500FC6B0005009761010093810175B9
-:1000C0001701007F130101F493050040732620CC33
+:1000C0001701007F130101F493050040732610CC43
 :1000D000B385C5023301B140F32630CC63860600F8
 :1000E000130500006B000500678000009305050004
 :1000F0009306000013060000130500006F30400156

runtime/tests/simple/main.c

@@ -28,21 +28,9 @@ unsigned z[] = {0, 0, 0, 0,
                 0, 0, 0, 0,
                 0, 0, 0, 0};
 
-void mat_add_kernel(void * void_arguments) {
+void mat_add_kernel(int task_id, void * void_arguments) {
 	mat_add_args_t * arguments = (mat_add_args_t *) void_arguments;
-
-	unsigned wid = vx_warp_id();
-	unsigned tid = vx_thread_id();
-
-	bool valid = (wid < arguments->numRows) && (tid < arguments->numColums);
-
-	// __if (valid)
-	// {
-		unsigned index = (wid * arguments->numColums) + tid;
-		unsigned val = arguments->x[index] + arguments->y[index];
-		arguments->z[index] = val;
-	// }
-	// __endif
+  arguments->z[task_id] = arguments->x[task_id] + arguments->y[task_id];
 }
 
 int main() {
@@ -98,7 +86,7 @@ int main() {
 		ptr++;
 	}
 
-	vx_printf("vx_spawn_warps mat_add_kernel\n");
+	vx_printf("vx_spawn_tasks mat_add_kernel\n");
 
 	mat_add_args_t arguments;
 	arguments.x         = x;
@@ -107,16 +95,13 @@ int main() {
 	arguments.numColums = 4;
 	arguments.numRows   = 4;
 
-	int numWarps   = 4;
-	int numThreads = 4;
-
-	vx_spawn_warps(numWarps, numThreads, mat_add_kernel, &arguments);
+	vx_spawn_tasks(arguments.numRows * arguments.numColums, mat_add_kernel, &arguments);
 
 	vx_printf("Waiting to ensure other warps are done... (Takes a while)\n");
 	for (int i = 0; i < 5000; i++) {}
 
-	for (int i = 0; i < numWarps; i++) {
-		for (int j = 0; j < numThreads; j++) {
+	for (int i = 0; i < arguments.numRows; i++) {
+		for (int j = 0; j < arguments.numColums; j++) {
 			unsigned index = (i * arguments.numColums) + j;
 			vx_printf("0x%x ", z[index]);
 		}