Andra Hugo 12 years ago
parent
commit
26aecfd1aa
46 changed files with 185 additions and 80 deletions
  1. 9 6
      configure.ac
  2. 4 0
      doc/chapters/configuration.texi
  3. 1 1
      examples/scheduler/dummy_sched.c
  4. 1 1
      include/starpu_config.h.in
  5. 1 1
      tests/datawizard/acquire_release.c
  6. 4 4
      tests/datawizard/acquire_release2.c
  7. 4 0
      tests/datawizard/copy.c
  8. 5 4
      tests/datawizard/critical_section_with_void_interface.c
  9. 3 3
      tests/datawizard/data_invalidation.c
  10. 5 1
      tests/datawizard/dsm_stress.c
  11. 5 0
      tests/datawizard/increment_redux.c
  12. 5 0
      tests/datawizard/increment_redux_lazy.c
  13. 5 0
      tests/datawizard/increment_redux_v2.c
  14. 8 3
      tests/datawizard/mpi_like_async.c
  15. 4 0
      tests/datawizard/readers_and_writers.c
  16. 2 3
      tests/datawizard/reclaim.c
  17. 7 2
      tests/datawizard/scratch.c
  18. 1 1
      tests/datawizard/sync_and_notify_data.c
  19. 1 1
      tests/datawizard/sync_and_notify_data_implicit.c
  20. 1 1
      tests/datawizard/sync_with_data_with_mem.c
  21. 1 1
      tests/datawizard/sync_with_data_with_mem_non_blocking.c
  22. 1 1
      tests/datawizard/sync_with_data_with_mem_non_blocking_implicit.c
  23. 1 1
      tests/datawizard/unpartition.c
  24. 13 6
      tests/datawizard/user_interaction_implicit.c
  25. 5 0
      tests/datawizard/wt_broadcast.c
  26. 5 0
      tests/datawizard/wt_host.c
  27. 5 5
      tests/main/declare_deps_after_submission.c
  28. 5 5
      tests/main/declare_deps_after_submission_synchronous.c
  29. 5 1
      tests/main/declare_deps_in_callback.c
  30. 4 0
      tests/main/empty_task.c
  31. 5 1
      tests/main/execute_on_a_specific_worker.c
  32. 4 4
      tests/main/get_current_task.c
  33. 4 4
      tests/main/multithreaded.c
  34. 4 0
      tests/main/regenerate.c
  35. 6 2
      tests/main/restart.c
  36. 4 3
      tests/main/starpu_task_wait.c
  37. 4 4
      tests/main/starpu_task_wait_for_all.c
  38. 4 3
      tests/main/static_restartable.c
  39. 4 3
      tests/main/static_restartable_tag.c
  40. 4 3
      tests/main/static_restartable_using_initializer.c
  41. 4 0
      tests/main/subgraph_repeat.c
  42. 4 0
      tests/main/subgraph_repeat_regenerate.c
  43. 4 0
      tests/main/subgraph_repeat_regenerate_tag.c
  44. 4 0
      tests/main/subgraph_repeat_tag.c
  45. 4 0
      tests/main/wait_all_regenerable_tasks.c
  46. 1 1
      tests/overlap/overlap.c

+ 9 - 6
configure.ac

@@ -181,12 +181,12 @@ AC_CHECK_FUNC([nearbyintf], [AC_DEFINE([STARPU_HAVE_NEARBYINTF], [1], [Define to
 # ... but they may define rintf.
 # ... but they may define rintf.
 AC_CHECK_FUNC([rintf], [AC_DEFINE([STARPU_HAVE_RINTF], [1], [Define to 1 if the function rintf is available.])])
 AC_CHECK_FUNC([rintf], [AC_DEFINE([STARPU_HAVE_RINTF], [1], [Define to 1 if the function rintf is available.])])
 
 
-# Define slow machine
-AC_ARG_ENABLE(slow-machine, [AS_HELP_STRING([--enable-slow-machine],
-				   [Lower default values for the testcases run by make check])],
-				   enable_slow_machine=$enableval, enable_slow_machine=false)
-if  test x$enable_slow_machine = xyes; then
-	AC_DEFINE(STARPU_SLOW_MACHINE, [1], [enable slow machine])
+# Define quick check
+AC_ARG_ENABLE(quick-check, [AS_HELP_STRING([--enable-quick-check],
+				   [Lower default values for the testcases run by make check to allow a faster execution])],
+				   enable_quick_check=$enableval, enable_quick_check=no)
+if  test x$enable_quick_check = xyes; then
+	AC_DEFINE(STARPU_QUICK_CHECK, [1], [enable quick check])
 fi
 fi
 
 
 AC_CHECK_HEADERS([malloc.h], [AC_DEFINE([STARPU_HAVE_MALLOC_H], [1], [Define to 1 if you have the <malloc.h> header file.])])
 AC_CHECK_HEADERS([malloc.h], [AC_DEFINE([STARPU_HAVE_MALLOC_H], [1], [Define to 1 if you have the <malloc.h> header file.])])
@@ -510,6 +510,9 @@ if test x$enable_cuda = xyes; then
 	AC_CHECK_HEADERS([cuda_gl_interop.h])
 	AC_CHECK_HEADERS([cuda_gl_interop.h])
 fi
 fi
 
 
+dnl Hey dude, are you around?
+PKG_PROG_PKG_CONFIG
+
 have_magma=no
 have_magma=no
 if test x$enable_cuda = xyes; then
 if test x$enable_cuda = xyes; then
 	PKG_CHECK_MODULES([MAGMA],  [magma], [
 	PKG_CHECK_MODULES([MAGMA],  [magma], [

+ 4 - 0
doc/chapters/configuration.texi

@@ -46,6 +46,10 @@ any value.
 @item --enable-coverage
 @item --enable-coverage
 Enable flags for the @code{gcov} coverage tool.
 Enable flags for the @code{gcov} coverage tool.
 
 
+@item --enable-quick-check
+Specify tests and examples should be run on a smaller data set, i.e
+allowing a faster execution time
+
 @item --with-hwloc
 @item --with-hwloc
 Specify hwloc should be used by StarPU. hwloc should be found by the
 Specify hwloc should be used by StarPU. hwloc should be found by the
 means of the tools @code{pkg-config}.
 means of the tools @code{pkg-config}.

+ 1 - 1
examples/scheduler/dummy_sched.c

@@ -155,7 +155,7 @@ int main(int argc, char **argv)
 		return 77;
 		return 77;
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 	ntasks /= 100;
 	ntasks /= 100;
 #endif
 #endif
 
 

+ 1 - 1
include/starpu_config.h.in

@@ -89,7 +89,7 @@ typedef ssize_t starpu_ssize_t;
 #define __starpu_func__ __func__
 #define __starpu_func__ __func__
 #endif
 #endif
 
 
-#undef STARPU_SLOW_MACHINE
+#undef STARPU_QUICK_CHECK
 #undef STARPU_USE_DRAND48
 #undef STARPU_USE_DRAND48
 #undef STARPU_USE_ERAND48_R
 #undef STARPU_USE_ERAND48_R
 
 

+ 1 - 1
tests/datawizard/acquire_release.c

@@ -19,7 +19,7 @@
 #include <starpu.h>
 #include <starpu.h>
 #include "../helper.h"
 #include "../helper.h"
 
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 static unsigned ntasks = 10;
 static unsigned ntasks = 10;
 #else
 #else
 static unsigned ntasks = 10000;
 static unsigned ntasks = 10000;

+ 4 - 4
tests/datawizard/acquire_release2.c

@@ -19,7 +19,11 @@
 
 
 #include "../helper.h"
 #include "../helper.h"
 
 
+#ifdef STARPU_QUICK_CHECK
+static unsigned ntasks = 40;
+#else
 static unsigned ntasks = 40000;
 static unsigned ntasks = 40000;
+#endif
 
 
 #ifdef STARPU_USE_CUDA
 #ifdef STARPU_USE_CUDA
 extern void increment_cuda(void *descr[], __attribute__ ((unused)) void *_args);
 extern void increment_cuda(void *descr[], __attribute__ ((unused)) void *_args);
@@ -92,10 +96,6 @@ int main(int argc, char **argv)
 
 
         FPRINTF(stderr, "Token: %u\n", token);
         FPRINTF(stderr, "Token: %u\n", token);
 
 
-#ifdef STARPU_SLOW_MACHINE
-	ntasks /= 10;
-#endif
-
 	for(i=0; i<ntasks; i++)
 	for(i=0; i<ntasks; i++)
 	{
 	{
                 ret = starpu_data_acquire_cb(token_handle, STARPU_W, callback, NULL);  // recv
                 ret = starpu_data_acquire_cb(token_handle, STARPU_W, callback, NULL);  // recv

+ 4 - 0
tests/datawizard/copy.c

@@ -18,7 +18,11 @@
 #include <starpu.h>
 #include <starpu.h>
 #include "../helper.h"
 #include "../helper.h"
 
 
+#ifdef STARPU_QUICK_CHECK
+static unsigned nloops = 10;
+#else
 static unsigned nloops = 1000;
 static unsigned nloops = 1000;
+#endif
 
 
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
 {
 {

+ 5 - 4
tests/datawizard/critical_section_with_void_interface.c

@@ -48,13 +48,14 @@ static struct starpu_codelet cl =
 
 
 int main(int argc, char **argv)
 int main(int argc, char **argv)
 {
 {
+#ifdef STARPU_QUICK_CHECK
+	int ntasks = 10;
+#else
 	int ntasks = 1000;
 	int ntasks = 1000;
-	int ret;
-
-#ifdef STARPU_SLOW_MACHINE
-	ntasks /= 10;
 #endif
 #endif
 
 
+	int ret;
+
 	ret = starpu_init(NULL);
 	ret = starpu_init(NULL);
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");

+ 3 - 3
tests/datawizard/data_invalidation.c

@@ -23,10 +23,10 @@
 #include <stdlib.h>
 #include <stdlib.h>
 #include "../helper.h"
 #include "../helper.h"
 
 
-#ifdef STARPU_SLOW_MACHINE
-#define NLOOPS		100
+#ifdef STARPU_QUICK_CHECK
+#  define NLOOPS		100
 #else
 #else
-#define NLOOPS		1000
+#  define NLOOPS		1000
 #endif
 #endif
 #define VECTORSIZE	1024
 #define VECTORSIZE	1024
 
 

+ 5 - 1
tests/datawizard/dsm_stress.c

@@ -23,7 +23,11 @@
 #include <pthread.h>
 #include <pthread.h>
 #include "../helper.h"
 #include "../helper.h"
 
 
-#define N	10000
+#ifdef STARPU_QUICK_CHECK
+#  define N	100
+#else
+#  define N	10000
+#endif
 
 
 #define VECTORSIZE	1024
 #define VECTORSIZE	1024
 
 

+ 5 - 0
tests/datawizard/increment_redux.c

@@ -220,8 +220,13 @@ int main(int argc, char **argv)
 
 
 	starpu_data_set_reduction_methods(handle, &redux_cl, &neutral_cl);
 	starpu_data_set_reduction_methods(handle, &redux_cl, &neutral_cl);
 
 
+#ifdef STARPU_QUICK_CHECK
+	unsigned ntasks = 32;
+	unsigned nloops = 4;
+#else
 	unsigned ntasks = 1024;
 	unsigned ntasks = 1024;
 	unsigned nloops = 16;
 	unsigned nloops = 16;
+#endif
 
 
 	unsigned loop;
 	unsigned loop;
 	unsigned t;
 	unsigned t;

+ 5 - 0
tests/datawizard/increment_redux_lazy.c

@@ -201,8 +201,13 @@ int main(int argc, char **argv)
 
 
 	starpu_data_set_reduction_methods(handle, &redux_cl, &neutral_cl);
 	starpu_data_set_reduction_methods(handle, &redux_cl, &neutral_cl);
 
 
+#ifdef STARPU_QUICK_CHECK
+	unsigned ntasks = 32;
+	unsigned nloops = 4;
+#else
 	unsigned ntasks = 1024;
 	unsigned ntasks = 1024;
 	unsigned nloops = 16;
 	unsigned nloops = 16;
+#endif
 
 
 	unsigned loop;
 	unsigned loop;
 	unsigned t;
 	unsigned t;

+ 5 - 0
tests/datawizard/increment_redux_v2.c

@@ -233,8 +233,13 @@ int main(int argc, char **argv)
 
 
 	starpu_data_set_reduction_methods(handle, &redux_cl, &neutral_cl);
 	starpu_data_set_reduction_methods(handle, &redux_cl, &neutral_cl);
 
 
+#ifdef STARPU_QUICK_CHECK
+	unsigned ntasks = 32;
+	unsigned nloops = 4;
+#else
 	unsigned ntasks = 1024;
 	unsigned ntasks = 1024;
 	unsigned nloops = 16;
 	unsigned nloops = 16;
+#endif
 
 
 	unsigned loop;
 	unsigned loop;
 	unsigned t;
 	unsigned t;

+ 8 - 3
tests/datawizard/mpi_like_async.c

@@ -20,8 +20,13 @@
 #include <pthread.h>
 #include <pthread.h>
 #include "../helper.h"
 #include "../helper.h"
 
 
-#define NTHREADS_DEFAULT	16
-#define NITER_DEFAULT		128
+#ifdef STARPU_SLOW_MACHINE
+#  define NTHREADS_DEFAULT	4
+#  define NITER_DEFAULT		8
+#else
+#  define NTHREADS_DEFAULT	16
+#  define NITER_DEFAULT		128
+#endif
 
 
 static int nthreads = NTHREADS_DEFAULT;
 static int nthreads = NTHREADS_DEFAULT;
 static int niter = NITER_DEFAULT;
 static int niter = NITER_DEFAULT;
@@ -309,7 +314,7 @@ int main(int argc, char **argv)
 	int ret;
 	int ret;
 	void *retval;
 	void *retval;
 
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 	niter /= 16;
 	niter /= 16;
 	nthreads /= 4;
 	nthreads /= 4;
 #endif
 #endif

+ 4 - 0
tests/datawizard/readers_and_writers.c

@@ -56,7 +56,11 @@ int main(int argc, char **argv)
 	/* initialize the resource */
 	/* initialize the resource */
 	starpu_vector_data_register(&book_handle, 0, (uintptr_t)&book, 1, sizeof(unsigned));
 	starpu_vector_data_register(&book_handle, 0, (uintptr_t)&book, 1, sizeof(unsigned));
 
 
+#ifdef STARPU_QUICK_CHECK
+	unsigned ntasks = 16;
+#else
 	unsigned ntasks = 16*1024;
 	unsigned ntasks = 16*1024;
+#endif
 
 
 	unsigned t;
 	unsigned t;
 	for (t = 0; t < ntasks; t++)
 	for (t = 0; t < ntasks; t++)

+ 2 - 3
tests/datawizard/reclaim.c

@@ -28,7 +28,7 @@
 #endif
 #endif
 #include "../helper.h"
 #include "../helper.h"
 
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 #  define BLOCK_SIZE (64*1024)
 #  define BLOCK_SIZE (64*1024)
 static unsigned ntasks = 250;
 static unsigned ntasks = 250;
 #else
 #else
@@ -87,11 +87,10 @@ int main(int argc, char **argv)
 	if (2*mb > ntasks)
 	if (2*mb > ntasks)
 		ntasks = 2*mb;
 		ntasks = 2*mb;
 
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 	mb /= 100;
 	mb /= 100;
 	if (mb == 0)
 	if (mb == 0)
 		mb = 1;
 		mb = 1;
-	ntasks /= 100;
 #endif
 #endif
 
 
 	FPRINTF(stderr, "Allocate %d buffers and create %u tasks\n", mb, ntasks);
 	FPRINTF(stderr, "Allocate %d buffers and create %u tasks\n", mb, ntasks);

+ 7 - 2
tests/datawizard/scratch.c

@@ -23,8 +23,13 @@
 #include <stdlib.h>
 #include <stdlib.h>
 #include "../helper.h"
 #include "../helper.h"
 
 
-#define NLOOPS		128
-#define VECTORSIZE	1024
+#ifdef STARPU_QUICK_CHECK
+#  define NLOOPS		8
+#  define VECTORSIZE		128
+#else
+#  define NLOOPS		128
+#  define VECTORSIZE		1024
+#endif
 
 
 static unsigned *A;
 static unsigned *A;
 starpu_data_handle_t A_handle, B_handle;
 starpu_data_handle_t A_handle, B_handle;

+ 1 - 1
tests/datawizard/sync_and_notify_data.c

@@ -85,7 +85,7 @@ int main(int argc, char **argv)
 {
 {
 	int ret;
 	int ret;
 
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 	n /= 10;
 	n /= 10;
 	k /= 16;
 	k /= 16;
 #endif
 #endif

+ 1 - 1
tests/datawizard/sync_and_notify_data_implicit.c

@@ -120,7 +120,7 @@ int main(int argc, char **argv)
 {
 {
 	int ret;
 	int ret;
 
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 	n /= 10;
 	n /= 10;
 	k /= 8;
 	k /= 8;
 #endif
 #endif

+ 1 - 1
tests/datawizard/sync_with_data_with_mem.c

@@ -69,7 +69,7 @@ int main(int argc, char **argv)
 {
 {
 	int ret;
 	int ret;
 
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 	nbuffers /= 4;
 	nbuffers /= 4;
 	niter /= 4;
 	niter /= 4;
 	vectorsize /= 8;
 	vectorsize /= 8;

+ 1 - 1
tests/datawizard/sync_with_data_with_mem_non_blocking.c

@@ -86,7 +86,7 @@ int main(int argc, char **argv)
 {
 {
 	int ret;
 	int ret;
 
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 	nbuffers /= 4;
 	nbuffers /= 4;
 	niter /= 4;
 	niter /= 4;
 	vectorsize /= 8;
 	vectorsize /= 8;

+ 1 - 1
tests/datawizard/sync_with_data_with_mem_non_blocking_implicit.c

@@ -86,7 +86,7 @@ int main(int argc, char **argv)
 {
 {
 	int ret;
 	int ret;
 
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 	nbuffers /= 4;
 	nbuffers /= 4;
 	niter /= 4;
 	niter /= 4;
 	vectorsize /= 8;
 	vectorsize /= 8;

+ 1 - 1
tests/datawizard/unpartition.c

@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <stdlib.h>
 #include "../helper.h"
 #include "../helper.h"
 
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 #define NITER		100
 #define NITER		100
 #else
 #else
 #define NITER		1000
 #define NITER		1000

+ 13 - 6
tests/datawizard/user_interaction_implicit.c

@@ -23,8 +23,13 @@
 #include <pthread.h>
 #include <pthread.h>
 #include "../helper.h"
 #include "../helper.h"
 
 
-#define NBUFFERS	16
-#define NITER		128
+#ifdef STARPU_QUICK_CHECK
+#  define NBUFFERS	4
+#  define NITER		16
+#else
+#  define NBUFFERS	16
+#  define NITER		128
+#endif
 
 
 struct data
 struct data
 {
 {
@@ -61,11 +66,13 @@ int main(int argc, char **argv)
 
 
 	unsigned iter;
 	unsigned iter;
 	for (iter = 0; iter < NITER; iter++)
 	for (iter = 0; iter < NITER; iter++)
-	for (b = 0; b < NBUFFERS; b++)
 	{
 	{
-		ret = starpu_data_acquire_cb(buffers[b].handle, STARPU_RW,
-					     callback_sync_data, &buffers[b]);
-		STARPU_CHECK_RETURN_VALUE(ret, "starpu_data_acquire_cb");
+		for (b = 0; b < NBUFFERS; b++)
+		{
+			ret = starpu_data_acquire_cb(buffers[b].handle, STARPU_RW,
+						     callback_sync_data, &buffers[b]);
+			STARPU_CHECK_RETURN_VALUE(ret, "starpu_data_acquire_cb");
+		}
 	}
 	}
 
 
 	ret = starpu_task_wait_for_all();
 	ret = starpu_task_wait_for_all();

+ 5 - 0
tests/datawizard/wt_broadcast.c

@@ -99,8 +99,13 @@ int main(int argc, char **argv)
 	 * to broadcast the handle whenever it is modified. */
 	 * to broadcast the handle whenever it is modified. */
 	starpu_data_set_wt_mask(handle, ~0);
 	starpu_data_set_wt_mask(handle, ~0);
 
 
+#ifdef STARPU_QUICK_CHECK
+	unsigned ntasks = 32;
+	unsigned nloops = 4;
+#else
 	unsigned ntasks = 1024;
 	unsigned ntasks = 1024;
 	unsigned nloops = 16;
 	unsigned nloops = 16;
+#endif
 
 
 	unsigned loop;
 	unsigned loop;
 	unsigned t;
 	unsigned t;

+ 5 - 0
tests/datawizard/wt_host.c

@@ -99,8 +99,13 @@ int main(int argc, char **argv)
 	uint32_t wt_mask = (1<<0);
 	uint32_t wt_mask = (1<<0);
 	starpu_data_set_wt_mask(handle, wt_mask);
 	starpu_data_set_wt_mask(handle, wt_mask);
 
 
+#ifdef STARPU_QUICK_CHECK
+	unsigned ntasks = 32;
+	unsigned nloops = 4;
+#else
 	unsigned ntasks = 1024;
 	unsigned ntasks = 1024;
 	unsigned nloops = 16;
 	unsigned nloops = 16;
+#endif
 
 
 	unsigned loop;
 	unsigned loop;
 	unsigned t;
 	unsigned t;

+ 5 - 5
tests/main/declare_deps_after_submission.c

@@ -22,7 +22,11 @@
 #include <starpu.h>
 #include <starpu.h>
 #include "../helper.h"
 #include "../helper.h"
 
 
-#define NLOOPS	128
+#ifdef STARPU_QUICK_CHECK
+  #define NLOOPS	4
+#else
+  #define NLOOPS	128
+#endif
 
 
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
 {
 {
@@ -52,10 +56,6 @@ int main(int argc, char **argv)
 	int ret;
 	int ret;
 	unsigned loop, nloops = NLOOPS;
 	unsigned loop, nloops = NLOOPS;
 
 
-#ifdef STARPU_SLOW_MACHINE
-	nloops /= 8;
-#endif
-
 	ret = starpu_init(NULL);
 	ret = starpu_init(NULL);
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");

+ 5 - 5
tests/main/declare_deps_after_submission_synchronous.c

@@ -22,7 +22,11 @@
 #include <starpu.h>
 #include <starpu.h>
 #include "../helper.h"
 #include "../helper.h"
 
 
-#define NLOOPS	128
+#ifdef STARPU_QUICK_CHECK
+  #define NLOOPS	4
+#else
+  #define NLOOPS	128
+#endif
 
 
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
 {
 {
@@ -52,10 +56,6 @@ int main(int argc, char **argv)
 	int ret;
 	int ret;
 	unsigned loop, nloops=NLOOPS;
 	unsigned loop, nloops=NLOOPS;
 
 
-#ifdef STARPU_SLOW_MACHINE
-	nloops /= 8;
-#endif
-
 	ret = starpu_init(NULL);
 	ret = starpu_init(NULL);
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");

+ 5 - 1
tests/main/declare_deps_in_callback.c

@@ -23,7 +23,11 @@
 #include <starpu.h>
 #include <starpu.h>
 #include "../helper.h"
 #include "../helper.h"
 
 
-#define NLOOPS	128
+#ifdef STARPU_QUICK_CHECK
+  #define NLOOPS	4
+#else
+  #define NLOOPS	128
+#endif
 
 
 static void callback(void *arg)
 static void callback(void *arg)
 {
 {

+ 4 - 0
tests/main/empty_task.c

@@ -23,7 +23,11 @@
 #include <starpu.h>
 #include <starpu.h>
 #include "../helper.h"
 #include "../helper.h"
 
 
+#ifdef STARPU_QUICK_CHECK
+static unsigned ntasks = 64;
+#else
 static unsigned ntasks = 65536;
 static unsigned ntasks = 65536;
+#endif
 
 
 static void usage(char **argv)
 static void usage(char **argv)
 {
 {

+ 5 - 1
tests/main/execute_on_a_specific_worker.c

@@ -23,7 +23,11 @@
 #include <pthread.h>
 #include <pthread.h>
 #include "../helper.h"
 #include "../helper.h"
 
 
-#define N	1000
+#ifdef STARPU_QUICK_CHECK
+  #define N 100
+#else
+  #define N 1000
+#endif
 
 
 #define VECTORSIZE	1024
 #define VECTORSIZE	1024
 
 

+ 4 - 4
tests/main/get_current_task.c

@@ -22,7 +22,11 @@
 #include <starpu.h>
 #include <starpu.h>
 #include "../helper.h"
 #include "../helper.h"
 
 
+#ifdef STARPU_QUICK_CHECK
+static unsigned ntasks = 64;
+#else
 static unsigned ntasks = 65536;
 static unsigned ntasks = 65536;
+#endif
 
 
 static void check_task_func(void *descr[], void *arg)
 static void check_task_func(void *descr[], void *arg)
 {
 {
@@ -57,10 +61,6 @@ int main(int argc, char **argv)
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
 
-#ifdef STARPU_SLOW_MACHINE
-	ntasks /= 10;
-#endif
-
 	FPRINTF(stderr, "#tasks : %u\n", ntasks);
 	FPRINTF(stderr, "#tasks : %u\n", ntasks);
 
 
 	int i;
 	int i;

+ 4 - 4
tests/main/multithreaded.c

@@ -27,7 +27,11 @@
 
 
 pthread_t threads[16];
 pthread_t threads[16];
 
 
+#ifdef STARPU_QUICK_CHECK
+static unsigned ntasks = 64;
+#else
 static unsigned ntasks = 65536;
 static unsigned ntasks = 65536;
+#endif
 static unsigned nthreads = 2;
 static unsigned nthreads = 2;
 
 
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
@@ -105,10 +109,6 @@ int main(int argc, char **argv)
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
 
-#ifdef STARPU_SLOW_MACHINE
-	ntasks /= 10;
-#endif
-
 	FPRINTF(stderr, "#tasks : %u\n", ntasks);
 	FPRINTF(stderr, "#tasks : %u\n", ntasks);
 
 
 	gettimeofday(&start, NULL);
 	gettimeofday(&start, NULL);

+ 4 - 0
tests/main/regenerate.c

@@ -22,7 +22,11 @@
 #include <starpu.h>
 #include <starpu.h>
 #include "../helper.h"
 #include "../helper.h"
 
 
+#ifdef STARPU_QUICK_CHECK
+static unsigned ntasks = 64;
+#else
 static unsigned ntasks = 65536;
 static unsigned ntasks = 65536;
+#endif
 static unsigned cnt = 0;
 static unsigned cnt = 0;
 
 
 static unsigned completed = 0;
 static unsigned completed = 0;

+ 6 - 2
tests/main/restart.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  *
  * Copyright (C) 2009, 2010  Université de Bordeaux 1
  * Copyright (C) 2009, 2010  Université de Bordeaux 1
- * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
+ * Copyright (C) 2010, 2011, 2012  Centre National de la Recherche Scientifique
  *
  *
  * StarPU is free software; you can redistribute it and/or modify
  * 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
  * it under the terms of the GNU Lesser General Public License as published by
@@ -24,7 +24,11 @@
 
 
 #include "../helper.h"
 #include "../helper.h"
 
 
-#define N	10
+#ifdef STARPU_QUICK_CHECK
+  #define N	2
+#else
+  #define N	10
+#endif
 
 
 struct timeval start;
 struct timeval start;
 struct timeval end;
 struct timeval end;

+ 4 - 3
tests/main/starpu_task_wait.c

@@ -23,7 +23,11 @@
 #include <starpu.h>
 #include <starpu.h>
 #include "../helper.h"
 #include "../helper.h"
 
 
+#ifdef STARPU_QUICK_CHECK
+static unsigned ntasks = 64;
+#else
 static unsigned ntasks = 65536;
 static unsigned ntasks = 65536;
+#endif
 
 
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
 {
 {
@@ -69,9 +73,6 @@ int main(int argc, char **argv)
 
 
 	parse_args(argc, argv);
 	parse_args(argc, argv);
 
 
-#ifdef STARPU_SLOW_MACHINE
-	ntasks /= 1024;
-#endif
 #ifdef STARPU_HAVE_VALGRIND_H
 #ifdef STARPU_HAVE_VALGRIND_H
 	if(RUNNING_ON_VALGRIND) ntasks = 5;
 	if(RUNNING_ON_VALGRIND) ntasks = 5;
 #endif
 #endif

+ 4 - 4
tests/main/starpu_task_wait_for_all.c

@@ -22,7 +22,11 @@
 #include <unistd.h>
 #include <unistd.h>
 #include "../helper.h"
 #include "../helper.h"
 
 
+#ifdef STARPU_QUICK_CHECK
+static unsigned ntasks = 64;
+#else
 static unsigned ntasks = 65536;
 static unsigned ntasks = 65536;
+#endif
 
 
 static void dummy_func(void *descr[], void *arg)
 static void dummy_func(void *descr[], void *arg)
 {
 {
@@ -106,10 +110,6 @@ int main(int argc, char **argv)
 
 
 	parse_args(argc, argv, &conf);
 	parse_args(argc, argv, &conf);
 
 
-#ifdef STARPU_SLOW_MACHINE
-	ntasks /= 10;
-#endif
-
 	ret = starpu_init(&conf);
 	ret = starpu_init(&conf);
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");

+ 4 - 3
tests/main/static_restartable.c

@@ -22,7 +22,11 @@
 #include <starpu.h>
 #include <starpu.h>
 #include "../helper.h"
 #include "../helper.h"
 
 
+#ifdef STARPU_QUICK_CHECK
+static unsigned ntasks = 64;
+#else
 static unsigned ntasks = 65536;
 static unsigned ntasks = 65536;
+#endif
 
 
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
 {
 {
@@ -63,9 +67,6 @@ int main(int argc, char **argv)
 
 
 	parse_args(argc, argv);
 	parse_args(argc, argv);
 
 
-#ifdef STARPU_SLOW_MACHINE
-	ntasks /= 100;
-#endif
 #ifdef STARPU_HAVE_VALGRIND_H
 #ifdef STARPU_HAVE_VALGRIND_H
 	if(RUNNING_ON_VALGRIND) ntasks = 5;
 	if(RUNNING_ON_VALGRIND) ntasks = 5;
 #endif
 #endif

+ 4 - 3
tests/main/static_restartable_tag.c

@@ -23,7 +23,11 @@
 #include <starpu.h>
 #include <starpu.h>
 #include "../helper.h"
 #include "../helper.h"
 
 
+#ifdef STARPU_QUICK_CHECK
+static unsigned ntasks = 64;
+#else
 static unsigned ntasks = 65536;
 static unsigned ntasks = 65536;
+#endif
 static starpu_tag_t tag = 0x32;
 static starpu_tag_t tag = 0x32;
 
 
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
@@ -65,9 +69,6 @@ int main(int argc, char **argv)
 
 
 	parse_args(argc, argv);
 	parse_args(argc, argv);
 
 
-#ifdef STARPU_SLOW_MACHINE
-	ntasks /= 100;
-#endif
 #ifdef STARPU_HAVE_VALGRIND_H
 #ifdef STARPU_HAVE_VALGRIND_H
 	if(RUNNING_ON_VALGRIND) ntasks = 5;
 	if(RUNNING_ON_VALGRIND) ntasks = 5;
 #endif
 #endif

+ 4 - 3
tests/main/static_restartable_using_initializer.c

@@ -25,7 +25,11 @@
 /* This is equivalent to calling starpu_task_init later on */
 /* This is equivalent to calling starpu_task_init later on */
 struct starpu_task task = STARPU_TASK_INITIALIZER;
 struct starpu_task task = STARPU_TASK_INITIALIZER;
 
 
+#ifdef STARPU_QUICK_CHECK
+static unsigned ntasks = 64;
+#else
 static unsigned ntasks = 65536;
 static unsigned ntasks = 65536;
+#endif
 
 
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
 static void dummy_func(void *descr[] __attribute__ ((unused)), void *arg __attribute__ ((unused)))
 {
 {
@@ -64,9 +68,6 @@ int main(int argc, char **argv)
 
 
 	parse_args(argc, argv);
 	parse_args(argc, argv);
 
 
-#ifdef STARPU_SLOW_MACHINE
-	ntasks /= 100;
-#endif
 #ifdef STARPU_HAVE_VALGRIND_H
 #ifdef STARPU_HAVE_VALGRIND_H
 	if(RUNNING_ON_VALGRIND) ntasks = 5;
 	if(RUNNING_ON_VALGRIND) ntasks = 5;
 #endif
 #endif

+ 4 - 0
tests/main/subgraph_repeat.c

@@ -21,7 +21,11 @@
 
 
 #include "../helper.h"
 #include "../helper.h"
 
 
+#ifdef STARPU_QUICK_CHECK
+static unsigned niter = 64;
+#else
 static unsigned niter = 16384;
 static unsigned niter = 16384;
+#endif
 
 
 /*
 /*
  *
  *

+ 4 - 0
tests/main/subgraph_repeat_regenerate.c

@@ -21,7 +21,11 @@
 
 
 #include "../helper.h"
 #include "../helper.h"
 
 
+#ifdef STARPU_QUICK_CHECK
+static unsigned niter = 64;
+#else
 static unsigned niter = 16384;
 static unsigned niter = 16384;
+#endif
 
 
 /*
 /*
  *
  *

+ 4 - 0
tests/main/subgraph_repeat_regenerate_tag.c

@@ -21,7 +21,11 @@
 
 
 #include "../helper.h"
 #include "../helper.h"
 
 
+#ifdef STARPU_QUICK_CHECK
+static unsigned niter = 64;
+#else
 static unsigned niter = 16384;
 static unsigned niter = 16384;
+#endif
 
 
 #define TAG_START 0
 #define TAG_START 0
 #define TAG_A 1
 #define TAG_A 1

+ 4 - 0
tests/main/subgraph_repeat_tag.c

@@ -21,7 +21,11 @@
 
 
 #include "../helper.h"
 #include "../helper.h"
 
 
+#ifdef STARPU_QUICK_CHECK
+static unsigned niter = 64;
+#else
 static unsigned niter = 16384;
 static unsigned niter = 16384;
+#endif
 
 
 /*
 /*
  *
  *

+ 4 - 0
tests/main/wait_all_regenerable_tasks.c

@@ -22,7 +22,11 @@
 #include <starpu.h>
 #include <starpu.h>
 #include "../helper.h"
 #include "../helper.h"
 
 
+#ifdef STARPU_QUICK_CHECK
+static unsigned ntasks = 64;
+#else
 static unsigned ntasks = 1024;
 static unsigned ntasks = 1024;
+#endif
 
 
 static void callback(void *arg)
 static void callback(void *arg)
 {
 {

+ 1 - 1
tests/overlap/overlap.c

@@ -25,7 +25,7 @@
 #include <pthread.h>
 #include <pthread.h>
 #include "../helper.h"
 #include "../helper.h"
 
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 #define NTASKS	1000
 #define NTASKS	1000
 #else
 #else
 #define NTASKS	10000
 #define NTASKS	10000