Pārlūkot izejas kodu

rename slow-machine to the more appropriate term quick-check

Nathalie Furmento 13 gadi atpakaļ
vecāks
revīzija
ccb2b1282d
50 mainītis faili ar 58 papildinājumiem un 58 dzēšanām
  1. 6 6
      configure.ac
  2. 1 1
      examples/basic_examples/variable.c
  3. 1 1
      examples/cg/cg.c
  4. 1 1
      examples/incrementer/incrementer.c
  5. 1 1
      examples/lu/lu_example.c
  6. 2 2
      examples/mult/xgemm.c
  7. 1 1
      examples/pipeline/pipeline.c
  8. 1 1
      examples/reductions/minmax_reduction.c
  9. 1 1
      examples/scheduler/dummy_sched.c
  10. 1 1
      examples/tag_example/tag_example.c
  11. 1 1
      examples/tag_example/tag_example2.c
  12. 1 1
      examples/tag_example/tag_example3.c
  13. 1 1
      examples/tag_example/tag_restartable.c
  14. 1 1
      include/starpu_config.h.in
  15. 1 1
      tests/datawizard/acquire_release.c
  16. 1 1
      tests/datawizard/acquire_release2.c
  17. 1 1
      tests/datawizard/critical_section_with_void_interface.c
  18. 1 1
      tests/datawizard/data_invalidation.c
  19. 1 1
      tests/datawizard/mpi_like_async.c
  20. 2 2
      tests/datawizard/reclaim.c
  21. 1 1
      tests/datawizard/sync_and_notify_data.c
  22. 1 1
      tests/datawizard/sync_and_notify_data_implicit.c
  23. 1 1
      tests/datawizard/sync_with_data_with_mem.c
  24. 1 1
      tests/datawizard/sync_with_data_with_mem_non_blocking.c
  25. 1 1
      tests/datawizard/sync_with_data_with_mem_non_blocking_implicit.c
  26. 1 1
      tests/datawizard/unpartition.c
  27. 1 1
      tests/main/declare_deps_after_submission.c
  28. 1 1
      tests/main/declare_deps_after_submission_synchronous.c
  29. 1 1
      tests/main/declare_deps_in_callback.c
  30. 1 1
      tests/main/empty_task.c
  31. 1 1
      tests/main/execute_on_a_specific_worker.c
  32. 1 1
      tests/main/get_current_task.c
  33. 1 1
      tests/main/multithreaded.c
  34. 1 1
      tests/main/regenerate.c
  35. 1 1
      tests/main/restart.c
  36. 1 1
      tests/main/starpu_task_wait.c
  37. 1 1
      tests/main/starpu_task_wait_for_all.c
  38. 1 1
      tests/main/static_restartable.c
  39. 1 1
      tests/main/static_restartable_tag.c
  40. 1 1
      tests/main/static_restartable_using_initializer.c
  41. 1 1
      tests/main/subgraph_repeat.c
  42. 1 1
      tests/main/subgraph_repeat_regenerate.c
  43. 1 1
      tests/main/subgraph_repeat_regenerate_tag.c
  44. 1 1
      tests/main/subgraph_repeat_tag.c
  45. 1 1
      tests/main/tag_task_data_deps.c
  46. 1 1
      tests/main/wait_all_regenerable_tasks.c
  47. 1 1
      tests/microbenchs/prefetch_data_on_node.c
  48. 1 1
      tests/microbenchs/sync_tasks_overhead.c
  49. 2 2
      tests/microbenchs/tasks_size_overhead.c
  50. 1 1
      tests/overlap/overlap.c

+ 6 - 6
configure.ac

@@ -181,12 +181,12 @@ AC_CHECK_FUNC([nearbyintf], [AC_DEFINE([STARPU_HAVE_NEARBYINTF], [1], [Define to
 # ... but they may define rintf.
 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
 
 AC_CHECK_HEADERS([malloc.h], [AC_DEFINE([STARPU_HAVE_MALLOC_H], [1], [Define to 1 if you have the <malloc.h> header file.])])

+ 1 - 1
examples/basic_examples/variable.c

@@ -45,7 +45,7 @@ int main(int argc, char **argv)
 	if (ret == -ENODEV) goto enodev;
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 	niter /= 100;
 #endif
         if (argc == 2) niter = atoi(argv[1]);

+ 1 - 1
examples/cg/cg.c

@@ -406,7 +406,7 @@ int main(int argc, char **argv)
 {
 	int ret;
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 	i_max = 16;
 #endif
 

+ 1 - 1
examples/incrementer/incrementer.c

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

+ 1 - 1
examples/lu/lu_example.c

@@ -300,7 +300,7 @@ int main(int argc, char **argv)
 
 	parse_args(argc, argv);
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 	size /= 4;
 	nblocks /= 4;
 #endif

+ 2 - 2
examples/mult/xgemm.c

@@ -33,7 +33,7 @@
 static unsigned niter = 10;
 static unsigned nslicesx = 4;
 static unsigned nslicesy = 4;
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 static unsigned xdim = 256;
 static unsigned ydim = 256;
 static unsigned zdim = 64;
@@ -287,7 +287,7 @@ int main(int argc, char **argv)
 
 	parse_args(argc, argv);
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 	niter /= 10;
 #endif
 

+ 1 - 1
examples/pipeline/pipeline.c

@@ -41,7 +41,7 @@
 #define FPRINTF(ofile, fmt, args ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ##args); }} while(0)
 
 /* Vector size */
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 #define N 16
 #else
 #define N 1048576

+ 1 - 1
examples/reductions/minmax_reduction.c

@@ -19,7 +19,7 @@
 #include <limits.h>
 #include <starpu.h>
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 static unsigned nblocks = 512;
 static unsigned entries_per_bock = 64;
 #else

+ 1 - 1
examples/scheduler/dummy_sched.c

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

+ 1 - 1
examples/tag_example/tag_example.c

@@ -43,7 +43,7 @@
 
 struct starpu_codelet cl = {};
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 #define Ni	32
 #define Nj	32
 #define Nk	32

+ 1 - 1
examples/tag_example/tag_example2.c

@@ -120,7 +120,7 @@ int main(int argc __attribute__((unused)) , char **argv __attribute__((unused)))
 		exit(77);
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 	ni /= 4;
 	nk /= 16;
 #endif

+ 1 - 1
examples/tag_example/tag_example3.c

@@ -122,7 +122,7 @@ int main(int argc __attribute__((unused)) , char **argv __attribute__((unused)))
 		exit(77);
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 	ni /= 4;
 	nk /= 16;
 #endif

+ 1 - 1
examples/tag_example/tag_restartable.c

@@ -129,7 +129,7 @@ int main(int argc __attribute__((unused)) , char **argv __attribute__((unused)))
 		return 77;
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 	ni /= 4;
 	nk /= 16;
 #endif

+ 1 - 1
include/starpu_config.h.in

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

+ 1 - 1
tests/datawizard/acquire_release.c

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

+ 1 - 1
tests/datawizard/acquire_release2.c

@@ -92,7 +92,7 @@ int main(int argc, char **argv)
 
         FPRINTF(stderr, "Token: %u\n", token);
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 	ntasks /= 10;
 #endif
 

+ 1 - 1
tests/datawizard/critical_section_with_void_interface.c

@@ -51,7 +51,7 @@ int main(int argc, char **argv)
 	int ntasks = 1000;
 	int ret;
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 	ntasks /= 10;
 #endif
 

+ 1 - 1
tests/datawizard/data_invalidation.c

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

+ 1 - 1
tests/datawizard/mpi_like_async.c

@@ -309,7 +309,7 @@ int main(int argc, char **argv)
 	int ret;
 	void *retval;
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 	niter /= 16;
 	nthreads /= 4;
 #endif

+ 2 - 2
tests/datawizard/reclaim.c

@@ -28,7 +28,7 @@
 #endif
 #include "../helper.h"
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 #  define BLOCK_SIZE (64*1024)
 static unsigned ntasks = 250;
 #else
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
 	if (2*mb > ntasks)
 		ntasks = 2*mb;
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 	mb /= 100;
 	if (mb == 0)
 		mb = 1;

+ 1 - 1
tests/datawizard/sync_and_notify_data.c

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

+ 1 - 1
tests/datawizard/sync_and_notify_data_implicit.c

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

+ 1 - 1
tests/datawizard/sync_with_data_with_mem.c

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

+ 1 - 1
tests/datawizard/unpartition.c

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

+ 1 - 1
tests/main/declare_deps_after_submission.c

@@ -22,7 +22,7 @@
 #include <starpu.h>
 #include "../helper.h"
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
   #define NLOOPS	4
 #else
   #define NLOOPS	128

+ 1 - 1
tests/main/declare_deps_after_submission_synchronous.c

@@ -22,7 +22,7 @@
 #include <starpu.h>
 #include "../helper.h"
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
   #define NLOOPS	4
 #else
   #define NLOOPS	128

+ 1 - 1
tests/main/declare_deps_in_callback.c

@@ -23,7 +23,7 @@
 #include <starpu.h>
 #include "../helper.h"
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
   #define NLOOPS	4
 #else
   #define NLOOPS	128

+ 1 - 1
tests/main/empty_task.c

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

+ 1 - 1
tests/main/execute_on_a_specific_worker.c

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

+ 1 - 1
tests/main/get_current_task.c

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

+ 1 - 1
tests/main/multithreaded.c

@@ -27,7 +27,7 @@
 
 pthread_t threads[16];
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 static unsigned ntasks = 64;
 #else
 static unsigned ntasks = 65536;

+ 1 - 1
tests/main/regenerate.c

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

+ 1 - 1
tests/main/restart.c

@@ -24,7 +24,7 @@
 
 #include "../helper.h"
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
   #define N	2
 #else
   #define N	10

+ 1 - 1
tests/main/starpu_task_wait.c

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

+ 1 - 1
tests/main/starpu_task_wait_for_all.c

@@ -22,7 +22,7 @@
 #include <unistd.h>
 #include "../helper.h"
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 static unsigned ntasks = 64;
 #else
 static unsigned ntasks = 65536;

+ 1 - 1
tests/main/static_restartable.c

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

+ 1 - 1
tests/main/static_restartable_tag.c

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

+ 1 - 1
tests/main/static_restartable_using_initializer.c

@@ -25,7 +25,7 @@
 /* This is equivalent to calling starpu_task_init later on */
 struct starpu_task task = STARPU_TASK_INITIALIZER;
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 static unsigned ntasks = 64;
 #else
 static unsigned ntasks = 65536;

+ 1 - 1
tests/main/subgraph_repeat.c

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

+ 1 - 1
tests/main/subgraph_repeat_regenerate.c

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

+ 1 - 1
tests/main/subgraph_repeat_regenerate_tag.c

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

+ 1 - 1
tests/main/subgraph_repeat_tag.c

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

+ 1 - 1
tests/main/tag_task_data_deps.c

@@ -84,7 +84,7 @@ int main(int argc, char **argv)
 
 	starpu_data_handle_t handle1, handle2;
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 	return STARPU_TEST_SKIPPED;
 #endif
 

+ 1 - 1
tests/main/wait_all_regenerable_tasks.c

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

+ 1 - 1
tests/microbenchs/prefetch_data_on_node.c

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

+ 1 - 1
tests/microbenchs/sync_tasks_overhead.c

@@ -93,7 +93,7 @@ int main(int argc, char **argv)
 	struct timeval start;
 	struct timeval end;
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 	ntasks = 128;
 #endif
 

+ 2 - 2
tests/microbenchs/tasks_size_overhead.c

@@ -32,7 +32,7 @@
 
 #define START 4
 #define STOP 4096
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 #define FACTOR 8
 #else
 #define FACTOR 2
@@ -41,7 +41,7 @@
 starpu_data_handle_t data_handles[8];
 float *buffers[8];
 
-#ifdef STARPU_SLOW_MACHINE
+#ifdef STARPU_QUICK_CHECK
 static unsigned ntasks = 10;
 #else
 static unsigned ntasks = 1000;

+ 1 - 1
tests/overlap/overlap.c

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