Переглянути джерело

Reduce completion time of make check in non-quick non-long mode

Samuel Thibault 9 роки тому
батько
коміт
c0f741aa00

+ 8 - 1
examples/basic_examples/variable.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010, 2011, 2013, 2015  Université de Bordeaux
+ * Copyright (C) 2010, 2011, 2013, 2015-2016  Université de Bordeaux
  * Copyright (C) 2010, 2011, 2012, 2013, 2014  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -16,10 +16,17 @@
  */
 
 #include <starpu.h>
+#include <config.h>
 
 #define FPRINTF(ofile, fmt, ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ## __VA_ARGS__); }} while(0)
 
+#ifdef STARPU_QUICK_CHECK
+static unsigned niter = 500;
+#elif !(defined(STARPU_LONG_CHECK)
+static unsigned niter = 5000;
+#else
 static unsigned niter = 50000;
+#endif
 
 extern void cpu_codelet(void *descr[], STARPU_ATTRIBUTE_UNUSED void *_args);
 

+ 3 - 1
examples/cg/cg.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010-2012, 2014-2015  Université de Bordeaux
+ * Copyright (C) 2010-2012, 2014-2016  Université de Bordeaux
  *
  * 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
@@ -77,6 +77,8 @@ static starpu_data_handle_t A_handle, b_handle, x_handle;
 static TYPE *A, *b, *x;
 
 #ifdef STARPU_QUICK_CHECK
+static int i_max = 10;
+#elif !defined(STARPU_LONG_CHECK)
 static int i_max = 100;
 #else
 static int i_max = 1000;

+ 9 - 1
examples/incrementer/incrementer.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009-2011, 2013-2015  Université de Bordeaux
+ * Copyright (C) 2009-2011, 2013-2016  Université de Bordeaux
  * Copyright (C) 2010, 2011, 2012, 2013, 2016  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -19,8 +19,16 @@
  * This is just a small example which increments two values of a vector several times.
  */
 #include <starpu.h>
+#include <config.h>
 
+#ifdef STARPU_QUICK_CHECK
+static unsigned niter = 500;
+#elif !(defined(STARPU_LONG_CHECK)
+static unsigned niter = 5000;
+#else
 static unsigned niter = 50000;
+#endif
+
 #define FPRINTF(ofile, fmt, ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ## __VA_ARGS__); }} while(0)
 
 #ifdef STARPU_USE_CUDA

+ 8 - 1
examples/sched_ctx/dummy_sched_with_ctx.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010-2015  Université de Bordeaux
+ * Copyright (C) 2010-2016  Université de Bordeaux
  * Copyright (C) 2010-2013, 2016  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -17,8 +17,15 @@
 
 #include <starpu.h>
 #include <starpu_scheduler.h>
+#include <config.h>
 
+#ifdef STARPU_QUICK_CHECK
+#define NTASKS	320
+#elif !defined(STARPU_LONG_CHECK)
+#define NTASKS	3200
+#else
 #define NTASKS	32000
+#endif
 #define FPRINTF(ofile, fmt, ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ## __VA_ARGS__); }} while(0)
 
 struct dummy_sched_data

+ 7 - 0
examples/scheduler/dummy_sched.c

@@ -23,8 +23,15 @@
  */
 #include <starpu.h>
 #include <starpu_scheduler.h>
+#include <config.h>
 
+#ifdef STARPU_QUICK_CHECK
+#define NTASKS	320
+#elif !defined(STARPU_LONG_CHECK)
+#define NTASKS	3200
+#else
 #define NTASKS	32000
+#endif
 #define FPRINTF(ofile, fmt, ...) do { if (!getenv("STARPU_SSILENT")) {fprintf(ofile, fmt, ## __VA_ARGS__); }} while(0)
 
 struct dummy_sched_data

+ 4 - 0
mpi/examples/matrix_decomposition/mpi_decomposition_params.c

@@ -25,6 +25,10 @@
 unsigned size = 4*64;
 unsigned nblocks = 2;
 unsigned nbigblocks = 2;
+#elif !defined(STARPU_LONG_CHECK)
+unsigned size = 4*320;
+unsigned nblocks = 16;
+unsigned nbigblocks = 2;
 #else
 unsigned size = 16*320;
 unsigned nblocks = 16;

+ 5 - 1
mpi/examples/stencil/stencil5.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2011, 2013, 2015              Université Bordeaux
+ * Copyright (C) 2011, 2013, 2015-2016              Université Bordeaux
  * Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -46,6 +46,10 @@ struct starpu_codelet stencil5_cl =
 
 #ifdef STARPU_QUICK_CHECK
 #  define NITER_DEF	10
+#  define X         	2
+#  define Y         	2
+#elif !defined(STARPU_LONG_CHECK)
+#  define NITER_DEF	10
 #  define X         	5
 #  define Y         	5
 #else

+ 3 - 1
mpi/tests/insert_task_count.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010, 2014-2015  Université de Bordeaux
+ * Copyright (C) 2009, 2010, 2014-2016  Université de Bordeaux
  * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -20,6 +20,8 @@
 
 #ifdef STARPU_QUICK_CHECK
 #  define NITER	32
+#elif !defined(STARPU_LONG_CHECK)
+#  define NITER	256
 #else
 #  define NITER	2048
 #endif

+ 3 - 1
mpi/tests/mpi_detached_tag.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010, 2014-2015  Université de Bordeaux
+ * Copyright (C) 2010, 2014-2016  Université de Bordeaux
  * Copyright (C) 2010, 2011, 2012, 2013, 2016  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -20,6 +20,8 @@
 
 #ifdef STARPU_QUICK_CHECK
 #  define NITER	16
+#elif !defined(STARPU_LONG_CHECK)
+#  define NITER	256
 #else
 #  define NITER	2048
 #endif

+ 3 - 1
mpi/tests/mpi_irecv_detached.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010, 2012, 2014-2015  Université de Bordeaux
+ * Copyright (C) 2010, 2012, 2014-2016  Université de Bordeaux
  * Copyright (C) 2010, 2011, 2012, 2013, 2016  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -21,6 +21,8 @@
 
 #ifdef STARPU_QUICK_CHECK
 #  define NITER	16
+#elif !defined(STARPU_LONG_CHECK)
+#  define NITER	256
 #else
 #  define NITER	2048
 #endif

+ 3 - 1
mpi/tests/mpi_isend_detached.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010, 2012, 2014-2015  Université de Bordeaux
+ * Copyright (C) 2010, 2012, 2014-2016  Université de Bordeaux
  * Copyright (C) 2010, 2011, 2012, 2013, 2016  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -22,6 +22,8 @@
 
 #ifdef STARPU_QUICK_CHECK
 #  define NITER	16
+#elif !defined(STARPU_LONG_CHECK)
+#  define NITER	256
 #else
 #  define NITER	2048
 #endif

+ 3 - 1
mpi/tests/ring_async.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010, 2014-2015  Université de Bordeaux
+ * Copyright (C) 2009, 2010, 2014-2016  Université de Bordeaux
  * Copyright (C) 2010, 2011, 2012, 2013, 2016  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -20,6 +20,8 @@
 
 #ifdef STARPU_QUICK_CHECK
 #  define NITER	32
+#elif !defined(STARPU_LONG_CHECK)
+#  define NITER	256
 #else
 #  define NITER	2048
 #endif

+ 3 - 1
mpi/tests/ring_async_implicit.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010, 2015  Université de Bordeaux
+ * Copyright (C) 2010, 2015-2016  Université de Bordeaux
  * Copyright (C) 2010, 2011, 2012, 2013, 2016  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -20,6 +20,8 @@
 
 #ifdef STARPU_QUICK_CHECK
 #  define NITER	32
+#elif !defined(STARPU_LONG_CHECK)
+#  define NITER	256
 #else
 #  define NITER	2048
 #endif

+ 3 - 1
mpi/tests/ring_sync.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010, 2014-2015  Université de Bordeaux
+ * Copyright (C) 2009, 2010, 2014-2016  Université de Bordeaux
  * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2016  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -20,6 +20,8 @@
 
 #ifdef STARPU_QUICK_CHECK
 #  define NITER	32
+#elif !defined(STARPU_LONG_CHECK)
+#  define NITER	256
 #else
 #  define NITER	2048
 #endif

+ 3 - 1
mpi/tests/ring_sync_detached.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010, 2014-2015  Université de Bordeaux
+ * Copyright (C) 2009, 2010, 2014-2016  Université de Bordeaux
  * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016  CNRS
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -20,6 +20,8 @@
 
 #ifdef STARPU_QUICK_CHECK
 #  define NITER	32
+#elif !defined(STARPU_LONG_CHECK)
+#  define NITER	256
 #else
 #  define NITER	2048
 #endif

+ 2 - 0
tests/datawizard/acquire_release2.c

@@ -25,6 +25,8 @@
 
 #ifdef STARPU_QUICK_CHECK
 static unsigned ntasks = 40;
+#elif !defined(STARPU_LONG_CHECK)
+static unsigned ntasks = 4000;
 #else
 static unsigned ntasks = 40000;
 #endif

+ 2 - 0
tests/datawizard/sync_and_notify_data.c

@@ -83,6 +83,8 @@ int main(int argc, char **argv)
 
 #ifdef STARPU_QUICK_CHECK
 	n /= 10;
+#endif
+#ifndef STARPU_LONG_CHECK
 	k /= 16;
 #endif
 

+ 2 - 0
tests/datawizard/sync_and_notify_data_implicit.c

@@ -116,6 +116,8 @@ int main(int argc, char **argv)
 
 #ifdef STARPU_QUICK_CHECK
 	n /= 10;
+#endif
+#ifndef STARPU_LONG_CHECK
 	k /= 8;
 #endif
 

+ 3 - 0
tests/datawizard/test_arbiter.cpp

@@ -35,6 +35,9 @@
 #ifdef STARPU_QUICK_CHECK
 #define SLEEP_SLOW 6000
 #define SLEEP_FAST 1000
+#elif !defined(STARPU_LONG_CHECK)
+#define SLEEP_SLOW 60000
+#define SLEEP_FAST 10000
 #else
 #define SLEEP_SLOW 600000
 #define SLEEP_FAST 100000

+ 2 - 0
tests/sched_policies/prio.c

@@ -26,6 +26,8 @@
 
 #ifdef STARPU_QUICK_CHECK
 #define NTASKS 10
+#elif !defined(STARPU_LONG_CHECK)
+#define NTASKS 100
 #else
 #define NTASKS 1000
 #endif