瀏覽代碼

tests: remove gordon tests and gordon implementations

Nathalie Furmento 12 年之前
父節點
當前提交
2e5a29b311

+ 2 - 6
tests/Makefile.am

@@ -1,7 +1,7 @@
 # StarPU --- Runtime system for heterogeneous multicore architectures.
 #
 # Copyright (C) 2009-2013  Université de Bordeaux 1
-# Copyright (C) 2010, 2011, 2012  Centre National de la Recherche Scientifique
+# Copyright (C) 2010, 2011, 2012, 2013  Centre National de la Recherche Scientifique
 # Copyright (C) 2010, 2011, 2012  Institut National de Recherche en Informatique et Automatique
 #
 # StarPU is free software; you can redistribute it and/or modify
@@ -23,11 +23,9 @@ AM_LDFLAGS = $(STARPU_OPENCL_LDFLAGS) $(STARPU_CUDA_LDFLAGS) $(FXT_LDFLAGS)
 EXTRA_DIST =					\
 	helper.h				\
 	datawizard/scal.h			\
-	microbenchs/null_kernel_gordon.c	\
 	microbenchs/tasks_size_overhead.sh	\
 	microbenchs/tasks_size_overhead.gp	\
 	datawizard/scratch_opencl_kernel.cl     \
-	datawizard/sync_and_notify_data_gordon_kernels.c \
 	datawizard/sync_and_notify_data_opencl_codelet.cl\
 	datawizard/opencl_codelet_unsigned_inc_kernel.cl \
 	coverage/coverage.sh			\
@@ -47,9 +45,7 @@ EXTRA_DIST =					\
 	perfmodels/opencl_memset_kernel.cl
 
 CLEANFILES = 					\
-	*.gcno *.gcda *.linkinfo		\
-	microbenchs/null_kernel_gordon.spuelf	\
-	datawizard/sync_and_notify_data_gordon_kernels.spuelf
+	*.gcno *.gcda *.linkinfo
 
 BUILT_SOURCES =
 SUBDIRS =

+ 2 - 1
tests/datawizard/interfaces/test_interfaces.c

@@ -1,6 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2011  Institut National de Recherche en Informatique et Automatique
+ * Copyright (C) 2013  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -251,7 +252,7 @@ static int factor = -1;
  * Note that the global variable <current_config> is heavily used here.
  * Arguments :
  *	- taskp : a pointer to a valid task
- *	- type : STARPU_{CPU,CUDA,OPENCL}_WORKER. Gordon is not supported.
+ *	- type : STARPU_{CPU,CUDA,OPENCL}_WORKER.
  *      - id   : -1 if you dont care about the device where the task will be
  *		 executed, as long as it has the right type.
  *		 >= 0 if you want to make sure the task will be executed on the

+ 1 - 4
tests/datawizard/manual_reduction.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2010, 2012  Université de Bordeaux 1
- * Copyright (C) 2012  Centre National de la Recherche Scientifique
+ * Copyright (C) 2012, 2013  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -243,9 +243,6 @@ int main(int argc, char **argv)
 			clReleaseMemObject((void*)per_worker[worker]);
 			break;
 #endif /* !STARPU_USE_OPENCL */
-#ifdef STARPU_USE_GORDON
-		case STARPU_GORDON_WORKER: /* Not supported */	
-#endif /* ! STARPU_USE_GORDON */
 		default:
 			STARPU_ABORT();
 		}

+ 0 - 34
tests/datawizard/sync_and_notify_data_gordon_kernels.c

@@ -1,34 +0,0 @@
-/* StarPU --- Runtime system for heterogeneous multicore architectures.
- *
- * Copyright (C) 2010  Université de Bordeaux 1
- * Copyright (C) 2010  Centre National de la Recherche Scientifique
- *
- * StarPU is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * StarPU is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * See the GNU Lesser General Public License in COPYING.LGPL for more details.
- */
-
-void incA (__attribute__ ((unused)) void **alloc,
-                __attribute__ ((unused)) void **in,
-                __attribute__ ((unused)) void **inout,
-                __attribute__ ((unused)) void **out)
-{
-	unsigned *v = inout[0];
-	v[0]++;
-}
-
-void incC (__attribute__ ((unused)) void **alloc,
-                __attribute__ ((unused)) void **in,
-                __attribute__ ((unused)) void **inout,
-                __attribute__ ((unused)) void **out)
-{
-	unsigned *v = inout[0];
-	v[2]++;
-}

+ 0 - 23
tests/microbenchs/null_kernel_gordon.c

@@ -1,23 +0,0 @@
-/* StarPU --- Runtime system for heterogeneous multicore architectures.
- *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
- * Copyright (C) 2010  Centre National de la Recherche Scientifique
- *
- * StarPU is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version.
- *
- * StarPU is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * See the GNU Lesser General Public License in COPYING.LGPL for more details.
- */
-
-void empty_kernel (__attribute__ ((unused)) void **alloc,
-                __attribute__ ((unused)) void **in,
-                __attribute__ ((unused)) void **inout,
-                __attribute__ ((unused)) void **out)
-{
-}