Browse Source

use %f and %e instead of %lf and %le, as the latter are not defined by the ANSI standard, and have varying behavior depending on GNU or MSVC runtime

Samuel Thibault 14 years ago
parent
commit
d8aa7f19fa

+ 2 - 2
examples/incrementer/incrementer.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -117,7 +117,7 @@ int main(int argc, char **argv)
 	double timing = (double)((end.tv_sec - start.tv_sec)*1000000 +
 					(end.tv_usec - start.tv_usec));
 
-	FPRINTF(stderr, "%u elems took %lf ms\n", niter, timing/1000);
+	FPRINTF(stderr, "%u elems took %f ms\n", niter, timing/1000);
 
 	starpu_shutdown();
 

+ 1 - 1
examples/lu/lu_example.c

@@ -341,7 +341,7 @@ int main(int argc, char **argv)
 		} else {
 			starpu_bound_compute(&min, NULL, 0);
 			if (min != 0.)
-				FPRINTF(stderr, "theoretical min: %lf ms\n", min);
+				FPRINTF(stderr, "theoretical min: %f ms\n", min);
 		}
 	}
 

+ 2 - 2
examples/opt/pi/pi_redux.c

@@ -348,8 +348,8 @@ int main(int argc, char **argv)
 	double pi_approx = ((double)shot_cnt*4.0)/total;
 
 	FPRINTF(stderr, "Reductions? %s\n", use_redux?"yes":"no");
-	FPRINTF(stderr, "Pi approximation : %lf (%ld / %ld)\n", pi_approx, shot_cnt, total);
-	FPRINTF(stderr, "Error %le \n", pi_approx - PI);
+	FPRINTF(stderr, "Pi approximation : %f (%ld / %ld)\n", pi_approx, shot_cnt, total);
+	FPRINTF(stderr, "Error %e \n", pi_approx - PI);
 	FPRINTF(stderr, "Total time : %f ms\n", timing/1000.0);
 	FPRINTF(stderr, "Speed : %f GShot/s\n", total/(1e3*timing));
 

+ 4 - 4
examples/stencil/stencil.c

@@ -320,10 +320,10 @@ int main(int argc, char **argv)
 
 		fflush(stderr);
 
-		fprintf(stdout, "Computation took: %lf ms on %d MPI processes\n", max_timing/1000, world_size);
-		fprintf(stdout, "\tMIN : %lf ms\n", min_timing/1000);
-		fprintf(stdout, "\tMAX : %lf ms\n", max_timing/1000);
-		fprintf(stdout, "\tAVG : %lf ms\n", sum_timing/(world_size*1000));
+		fprintf(stdout, "Computation took: %f ms on %d MPI processes\n", max_timing/1000, world_size);
+		fprintf(stdout, "\tMIN : %f ms\n", min_timing/1000);
+		fprintf(stdout, "\tMAX : %f ms\n", max_timing/1000);
+		fprintf(stdout, "\tAVG : %f ms\n", sum_timing/(world_size*1000));
 	}
 
 	starpu_shutdown();

+ 5 - 5
mpi/examples/mpi_lu/plu_example.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010  Université de Bordeaux 1
+ * Copyright (C) 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -501,10 +501,10 @@ int main(int argc, char **argv)
 
 	if (rank == 0)
 	{
-		fprintf(stderr, "Computation took: %lf ms\n", max_timing/1000);
-		fprintf(stderr, "\tMIN : %lf ms\n", min_timing/1000);
-		fprintf(stderr, "\tMAX : %lf ms\n", max_timing/1000);
-		fprintf(stderr, "\tAVG : %lf ms\n", sum_timing/(world_size*1000));
+		fprintf(stderr, "Computation took: %f ms\n", max_timing/1000);
+		fprintf(stderr, "\tMIN : %f ms\n", min_timing/1000);
+		fprintf(stderr, "\tMAX : %f ms\n", max_timing/1000);
+		fprintf(stderr, "\tAVG : %f ms\n", sum_timing/(world_size*1000));
 
 		unsigned n = size;
 		double flop = (2.0f*n*n*n)/3.0f;

+ 1 - 1
mpi/examples/mpi_lu/pxlu.c

@@ -868,7 +868,7 @@ double STARPU_PLU(plu_main)(unsigned _nblocks, int _rank, int _world_size)
 
 	double timing = (double)((end.tv_sec - start.tv_sec)*1000000 + (end.tv_usec - start.tv_usec));
 	
-//	fprintf(stderr, "RANK %d -> took %lf ms\n", rank, timing/1000);
+//	fprintf(stderr, "RANK %d -> took %f ms\n", rank, timing/1000);
 	
 	return timing;
 }

+ 3 - 3
src/core/perfmodel/perfmodel_bus.c

@@ -386,7 +386,7 @@ static void measure_bandwidth_between_host_and_dev(int dev, double *dev_timing_h
 
 		double bandwidth_sum2 = bandwidth_dtoh*bandwidth_dtoh + bandwidth_htod*bandwidth_htod;
 
-		_STARPU_DISP("BANDWIDTH GPU %d CPU %u - htod %lf - dtoh %lf - %lf\n", dev, current_cpu, bandwidth_htod, bandwidth_dtoh, sqrt(bandwidth_sum2));
+		_STARPU_DISP("BANDWIDTH GPU %d CPU %u - htod %f - dtoh %f - %f\n", dev, current_cpu, bandwidth_htod, bandwidth_dtoh, sqrt(bandwidth_sum2));
 	}
 
 	unsigned best_cpu = dev_timing_per_cpu[(dev+1)*MAXCPUS+0].cpu_id;
@@ -760,7 +760,7 @@ static void write_bus_latency_file_content(void)
                                 latency = ((src && dst)?2000.0:500.0);
 			}
 
-			fprintf(f, "%lf\t", latency);
+			fprintf(f, "%f\t", latency);
 		}
 
 		fprintf(f, "\n");
@@ -912,7 +912,7 @@ static void write_bus_bandwidth_file_content(void)
 			        bandwidth = 0.0;
 			}
 
-			fprintf(f, "%lf\t", bandwidth);
+			fprintf(f, "%f\t", bandwidth);
 		}
 
 		fprintf(f, "\n");

+ 1 - 1
src/core/perfmodel/perfmodel_history.c

@@ -756,7 +756,7 @@ void _starpu_update_perfmodel_history(starpu_job_t j, struct starpu_perfmodel_t
 
 		STARPU_ASSERT(j->footprint_is_computed);
 
-		fprintf(debug_file, "0x%x\t%lu\t%lf\t%lf\t%d\t\t", j->footprint, (unsigned long) _starpu_job_get_data_size(j), measured, task->predicted, cpuid);
+		fprintf(debug_file, "0x%x\t%lu\t%f\t%f\t%d\t\t", j->footprint, (unsigned long) _starpu_job_get_data_size(j), measured, task->predicted, cpuid);
 		unsigned i;
 			
 		for (i = 0; i < task->cl->nbuffers; i++)

+ 5 - 5
src/debug/traces/starpu_fxt.c

@@ -176,7 +176,7 @@ static void update_accumulated_time(int worker, double sleep_time, double exec_t
 	if (forceflush || (elapsed > ACTIVITY_PERIOD))
 	{		
 		if (activity_file)
-			fprintf(activity_file, "%d\t%lf\t%lf\t%lf\t%lf\n", worker, current_timestamp, elapsed, accumulated_exec_time[worker], accumulated_sleep_time[worker]);
+			fprintf(activity_file, "%d\t%f\t%f\t%f\t%f\n", worker, current_timestamp, elapsed, accumulated_exec_time[worker], accumulated_sleep_time[worker]);
 
 		/* reset the accumulated times */
 		last_activity_flush_timestamp[worker] = current_timestamp;
@@ -596,7 +596,7 @@ static void handle_job_push(struct fxt_ev_64 *ev, struct starpu_fxt_options *opt
 		fprintf(out_paje_file, "13       %f ntask %ssched %f\n", current_timestamp, options->file_prefix, (float)curq_size);
 
 	if (activity_file)
-	fprintf(activity_file, "cnt_ready\t%lf\t%d\n", current_timestamp, curq_size);
+	fprintf(activity_file, "cnt_ready\t%f\t%d\n", current_timestamp, curq_size);
 }
 
 static void handle_job_pop(struct fxt_ev_64 *ev, struct starpu_fxt_options *options)
@@ -609,7 +609,7 @@ static void handle_job_pop(struct fxt_ev_64 *ev, struct starpu_fxt_options *opti
 		fprintf(out_paje_file, "13       %f ntask %ssched %f\n", current_timestamp, options->file_prefix, (float)curq_size);
 
 	if (activity_file)
-	fprintf(activity_file, "cnt_ready\t%lf\t%d\n", current_timestamp, curq_size);
+	fprintf(activity_file, "cnt_ready\t%f\t%d\n", current_timestamp, curq_size);
 }
 
 static
@@ -618,7 +618,7 @@ void handle_update_task_cnt(struct fxt_ev_64 *ev, struct starpu_fxt_options *opt
 	float current_timestamp = get_event_time_stamp(ev, options);
 	unsigned long nsubmitted = ev->param[0]; 
 	if (activity_file)
-	fprintf(activity_file, "cnt_submitted\t%lf\t%lu\n", current_timestamp, nsubmitted);
+	fprintf(activity_file, "cnt_submitted\t%f\t%lu\n", current_timestamp, nsubmitted);
 }
 
 static void handle_codelet_tag_deps(struct fxt_ev_64 *ev)
@@ -733,7 +733,7 @@ static void handle_set_profiling(struct fxt_ev_64 *ev, struct starpu_fxt_options
 	int status = ev->param[0];
 
 	if (activity_file)
-	fprintf(activity_file, "set_profiling\t%lf\t%d\n", get_event_time_stamp(ev, options), status);
+	fprintf(activity_file, "set_profiling\t%f\t%d\n", get_event_time_stamp(ev, options), status);
 }
 
 static void handle_task_wait_for_all(void)

+ 1 - 1
src/profiling/profiling_helpers.c

@@ -79,7 +79,7 @@ void starpu_worker_profiling_helper_display_summary(void)
 			if (info.used_cycles || info.stall_cycles)
 				fprintf(stderr, "\t%lu Mcy %lu Mcy stall\n", info.used_cycles/1000000, info.stall_cycles/1000000);
 			if (info.power_consumed)
-				fprintf(stderr, "\t%lf J consumed\n", info.power_consumed);
+				fprintf(stderr, "\t%f J consumed\n", info.power_consumed);
 		} else {
 			fprintf(stderr, "\t%-32s\t%d task(s)\n", name, info.executed_tasks);
 		}

+ 1 - 1
src/sched_policies/deque_modeling_policy_data_aware.c

@@ -497,7 +497,7 @@ static int _dmda_push_task(struct starpu_task *task, unsigned prio)
 				best_fitness = fitness[worker];
 				best = worker;
 
-	//			_STARPU_DEBUG("best fitness (worker %d) %le = alpha*(%le) + beta(%le) +gamma(%le)\n", worker, best_fitness, exp_end[worker] - best_exp_end, local_data_penalty[worker], local_power[worker]);
+	//			_STARPU_DEBUG("best fitness (worker %d) %e = alpha*(%e) + beta(%e) +gamma(%e)\n", worker, best_fitness, exp_end[worker] - best_exp_end, local_data_penalty[worker], local_power[worker]);
 			}
 		}
 	}

+ 3 - 3
tests/core/empty_task.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -79,8 +79,8 @@ int main(int argc, char **argv)
 
 	timing = (double)((end.tv_sec - start.tv_sec)*1000000 + (end.tv_usec - start.tv_usec));
 
-	FPRINTF(stderr, "Total: %lf secs\n", timing/1000000);
-	FPRINTF(stderr, "Per task: %lf usecs\n", timing/ntasks);
+	FPRINTF(stderr, "Total: %f secs\n", timing/1000000);
+	FPRINTF(stderr, "Per task: %f usecs\n", timing/ntasks);
 
 	starpu_shutdown();
 

+ 3 - 3
tests/core/multithreaded.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  * Copyright (C) 2011  Centre National de la Recherche Scientifique
  *
@@ -124,8 +124,8 @@ int main(int argc, char **argv)
 
 	timing = (double)((end.tv_sec - start.tv_sec)*1000000 + (end.tv_usec - start.tv_usec));
 
-	FPRINTF(stderr, "Total: %lf secs\n", timing/1000000);
-	FPRINTF(stderr, "Per task: %lf usecs\n", timing/(nthreads*ntasks));
+	FPRINTF(stderr, "Total: %f secs\n", timing/1000000);
+	FPRINTF(stderr, "Per task: %f usecs\n", timing/(nthreads*ntasks));
 
 	starpu_shutdown();
 

+ 3 - 3
tests/core/multithreaded_init.c

@@ -1,7 +1,7 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
  * Copyright (C) 2010  Institut National de Recherche en Informatique et Automatique
- * Copyright (C) 2010  Université de Bordeaux 1
+ * Copyright (C) 2010-2011  Université de Bordeaux 1
  *
  * 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
@@ -56,8 +56,8 @@ int main(int argc, char **argv)
   timing = (double)((end.tv_sec - start.tv_sec)*1000000 + (end.tv_usec - start.tv_usec));
 
   FPRINTF(stderr, "Success : %d threads launching simultaneously starpu_init\n", NUM_THREADS);
-  FPRINTF(stderr, "Total: %lf secs\n", timing/1000000);
-  FPRINTF(stderr, "Per task: %lf usecs\n", timing/NUM_THREADS);
+  FPRINTF(stderr, "Total: %f secs\n", timing/1000000);
+  FPRINTF(stderr, "Per task: %f usecs\n", timing/NUM_THREADS);
 
   starpu_shutdown();
 

+ 3 - 3
tests/core/regenerate.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010  Université de Bordeaux 1
+ * Copyright (C) 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -110,8 +110,8 @@ int main(int argc, char **argv)
 	timing = (double)((end.tv_sec - start.tv_sec)*1000000
 				+ (end.tv_usec - start.tv_usec));
 
-	FPRINTF(stderr, "Total: %lf secs\n", timing/1000000);
-	FPRINTF(stderr, "Per task: %lf usecs\n", timing/ntasks);
+	FPRINTF(stderr, "Total: %f secs\n", timing/1000000);
+	FPRINTF(stderr, "Per task: %f usecs\n", timing/ntasks);
 
 	starpu_shutdown();
 

+ 3 - 3
tests/core/starpu_task_wait.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010  Université de Bordeaux 1
+ * Copyright (C) 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -104,8 +104,8 @@ int main(int argc, char **argv)
 
 	timing = (double)((end.tv_sec - start.tv_sec)*1000000 + (end.tv_usec - start.tv_usec));
 
-	FPRINTF(stderr, "Total: %lf secs\n", timing/1000000);
-	FPRINTF(stderr, "Per task: %lf usecs\n", timing/ntasks);
+	FPRINTF(stderr, "Total: %f secs\n", timing/1000000);
+	FPRINTF(stderr, "Per task: %f usecs\n", timing/ntasks);
 
 	starpu_shutdown();
 

+ 3 - 3
tests/core/starpu_task_wait_for_all.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010  Université de Bordeaux 1
+ * Copyright (C) 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -136,8 +136,8 @@ int main(int argc, char **argv)
 
 	timing = (double)((end.tv_sec - start.tv_sec)*1000000 + (end.tv_usec - start.tv_usec));
 
-	FPRINTF(stderr, "Total: %lf secs\n", timing/1000000);
-	FPRINTF(stderr, "Per task: %lf usecs\n", timing/ntasks);
+	FPRINTF(stderr, "Total: %f secs\n", timing/1000000);
+	FPRINTF(stderr, "Per task: %f usecs\n", timing/ntasks);
 
 	starpu_shutdown();
 

+ 3 - 3
tests/core/static_restartable.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -85,8 +85,8 @@ int main(int argc, char **argv)
 	timing = (double)((end.tv_sec - start.tv_sec)*1000000
 				+ (end.tv_usec - start.tv_usec));
 
-	FPRINTF(stderr, "Total: %lf secs\n", timing/1000000);
-	FPRINTF(stderr, "Per task: %lf usecs\n", timing/ntasks);
+	FPRINTF(stderr, "Total: %f secs\n", timing/1000000);
+	FPRINTF(stderr, "Per task: %f usecs\n", timing/ntasks);
 
 	starpu_shutdown();
 

+ 3 - 3
tests/core/static_restartable_tag.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -89,8 +89,8 @@ int main(int argc, char **argv)
 	timing = (double)((end.tv_sec - start.tv_sec)*1000000
 				+ (end.tv_usec - start.tv_usec));
 
-	FPRINTF(stderr, "Total: %lf secs\n", timing/1000000);
-	FPRINTF(stderr, "Per task: %lf usecs\n", timing/ntasks);
+	FPRINTF(stderr, "Total: %f secs\n", timing/1000000);
+	FPRINTF(stderr, "Per task: %f usecs\n", timing/ntasks);
 
 	starpu_shutdown();
 

+ 3 - 3
tests/core/static_restartable_using_initializer.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2009, 2010  Université de Bordeaux 1
+ * Copyright (C) 2009, 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -84,8 +84,8 @@ int main(int argc, char **argv)
 	timing = (double)((end.tv_sec - start.tv_sec)*1000000
 				+ (end.tv_usec - start.tv_usec));
 
-	FPRINTF(stderr, "Total: %lf secs\n", timing/1000000);
-	FPRINTF(stderr, "Per task: %lf usecs\n", timing/ntasks);
+	FPRINTF(stderr, "Total: %f secs\n", timing/1000000);
+	FPRINTF(stderr, "Per task: %f usecs\n", timing/ntasks);
 
 	starpu_shutdown();
 

+ 3 - 3
tests/core/wait_all_regenerable_tasks.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010  Université de Bordeaux 1
+ * Copyright (C) 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -111,8 +111,8 @@ int main(int argc, char **argv)
 	timing = (double)((end.tv_sec - start.tv_sec)*1000000
 				+ (end.tv_usec - start.tv_usec));
 
-	FPRINTF(stderr, "Total: %lf secs\n", timing/1000000);
-	FPRINTF(stderr, "Per task: %lf usecs\n", timing/(K*ntasks));
+	FPRINTF(stderr, "Total: %f secs\n", timing/1000000);
+	FPRINTF(stderr, "Per task: %f usecs\n", timing/(K*ntasks));
 
 	starpu_shutdown();
 

+ 8 - 8
tests/microbenchs/async_tasks_overhead.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010  Université de Bordeaux 1
+ * Copyright (C) 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010, 2011  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -167,11 +167,11 @@ int main(int argc, char **argv)
 
 	timing = (double)((end.tv_sec - start.tv_sec)*1000000 + (end.tv_usec - start.tv_usec));
 
-	fprintf(stderr, "Total: %lf secs\n", timing/1000000);
-	fprintf(stderr, "Per task: %lf usecs\n", timing/ntasks);
-	fprintf(stderr, "Per task (except scheduler): %lf usecs\n", cumulated/ntasks);
-	fprintf(stderr, "Per task (push): %lf usecs\n", cumulated_push/ntasks);
-	fprintf(stderr, "Per task (pop): %lf usecs\n", cumulated_pop/ntasks);
+	fprintf(stderr, "Total: %f secs\n", timing/1000000);
+	fprintf(stderr, "Per task: %f usecs\n", timing/ntasks);
+	fprintf(stderr, "Per task (except scheduler): %f usecs\n", cumulated/ntasks);
+	fprintf(stderr, "Per task (push): %f usecs\n", cumulated_push/ntasks);
+	fprintf(stderr, "Per task (pop): %f usecs\n", cumulated_pop/ntasks);
 
         {
                 char *output_dir = getenv("STARPU_BENCH_DIR");
@@ -183,12 +183,12 @@ int main(int argc, char **argv)
 
                         sprintf(file, "%s/async_tasks_overhead_total.dat", output_dir);
                         f = fopen(file, "a");
-                        fprintf(f, "%s\t%lf\n", bench_id, timing/1000000);
+                        fprintf(f, "%s\t%f\n", bench_id, timing/1000000);
                         fclose(f);
 
                         sprintf(file, "%s/async_tasks_overhead_per_task.dat", output_dir);
                         f = fopen(file, "a");
-                        fprintf(f, "%s\t%lf\n", bench_id, timing/ntasks);
+                        fprintf(f, "%s\t%f\n", bench_id, timing/ntasks);
                         fclose(f);
                 }
         }

+ 5 - 5
tests/microbenchs/sync_tasks_overhead.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010  Université de Bordeaux 1
+ * Copyright (C) 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -106,8 +106,8 @@ int main(int argc, char **argv)
 
 	timing = (double)((end.tv_sec - start.tv_sec)*1000000 + (end.tv_usec - start.tv_usec));
 
-	fprintf(stderr, "Total: %lf secs\n", timing/1000000);
-	fprintf(stderr, "Per task: %lf usecs\n", timing/ntasks);
+	fprintf(stderr, "Total: %f secs\n", timing/1000000);
+	fprintf(stderr, "Per task: %f usecs\n", timing/ntasks);
 
         {
                 char *output_dir = getenv("STARPU_BENCH_DIR");
@@ -119,12 +119,12 @@ int main(int argc, char **argv)
 
                         sprintf(file, "%s/sync_tasks_overhead_total.dat", output_dir);
                         f = fopen(file, "a");
-                        fprintf(f, "%s\t%lf\n", bench_id, timing/1000000);
+                        fprintf(f, "%s\t%f\n", bench_id, timing/1000000);
                         fclose(f);
 
                         sprintf(file, "%s/sync_tasks_overhead_per_task.dat", output_dir);
                         f = fopen(file, "a");
-                        fprintf(f, "%s\t%lf\n", bench_id, timing/ntasks);
+                        fprintf(f, "%s\t%f\n", bench_id, timing/ntasks);
                         fclose(f);
                 }
         }

+ 13 - 13
tests/microbenchs/tasks_overhead.c

@@ -1,6 +1,6 @@
 /* StarPU --- Runtime system for heterogeneous multicore architectures.
  *
- * Copyright (C) 2010  Université de Bordeaux 1
+ * Copyright (C) 2010-2011  Université de Bordeaux 1
  * Copyright (C) 2010  Centre National de la Recherche Scientifique
  *
  * StarPU is free software; you can redistribute it and/or modify
@@ -141,14 +141,14 @@ int main(int argc, char **argv)
 	timing_submit = (double)((end_submit.tv_sec - start_submit.tv_sec)*1000000 + (end_submit.tv_usec - start_submit.tv_usec));
 	timing_exec = (double)((end_exec.tv_sec - start_exec.tv_sec)*1000000 + (end_exec.tv_usec - start_exec.tv_usec));
 
-	fprintf(stderr, "Total submit: %lf secs\n", timing_submit/1000000);
-	fprintf(stderr, "Per task submit: %lf usecs\n", timing_submit/ntasks);
+	fprintf(stderr, "Total submit: %f secs\n", timing_submit/1000000);
+	fprintf(stderr, "Per task submit: %f usecs\n", timing_submit/ntasks);
 	fprintf(stderr, "\n");
-	fprintf(stderr, "Total execution: %lf secs\n", timing_exec/1000000);
-	fprintf(stderr, "Per task execution: %lf usecs\n", timing_exec/ntasks);
+	fprintf(stderr, "Total execution: %f secs\n", timing_exec/1000000);
+	fprintf(stderr, "Per task execution: %f usecs\n", timing_exec/ntasks);
 	fprintf(stderr, "\n");
-	fprintf(stderr, "Total: %lf secs\n", (timing_submit+timing_exec)/1000000);
-	fprintf(stderr, "Per task: %lf usecs\n", (timing_submit+timing_exec)/ntasks);
+	fprintf(stderr, "Total: %f secs\n", (timing_submit+timing_exec)/1000000);
+	fprintf(stderr, "Per task: %f usecs\n", (timing_submit+timing_exec)/ntasks);
 
         {
                 char *output_dir = getenv("STARPU_BENCH_DIR");
@@ -160,32 +160,32 @@ int main(int argc, char **argv)
 
                         sprintf(file, "%s/tasks_overhead_total_submit.dat", output_dir);
                         f = fopen(file, "a");
-                        fprintf(f, "%s\t%lf\n", bench_id, timing_submit/1000000);
+                        fprintf(f, "%s\t%f\n", bench_id, timing_submit/1000000);
                         fclose(f);
 
                         sprintf(file, "%s/tasks_overhead_per_task_submit.dat", output_dir);
                         f = fopen(file, "a");
-                        fprintf(f, "%s\t%lf\n", bench_id, timing_submit/ntasks);
+                        fprintf(f, "%s\t%f\n", bench_id, timing_submit/ntasks);
                         fclose(f);
 
                         sprintf(file, "%s/tasks_overhead_total_execution.dat", output_dir);
                         f = fopen(file, "a");
-                        fprintf(f, "%s\t%lf\n", bench_id, timing_exec/1000000);
+                        fprintf(f, "%s\t%f\n", bench_id, timing_exec/1000000);
                         fclose(f);
 
                         sprintf(file, "%s/tasks_overhead_per_task_execution.dat", output_dir);
                         f = fopen(file, "a");
-                        fprintf(f, "%s\t%lf\n", bench_id, timing_exec/ntasks);
+                        fprintf(f, "%s\t%f\n", bench_id, timing_exec/ntasks);
                         fclose(f);
 
                         sprintf(file, "%s/tasks_overhead_total_submit_execution.dat", output_dir);
                         f = fopen(file, "a");
-                        fprintf(f, "%s\t%lf\n", bench_id, (timing_submit+timing_exec)/1000000);
+                        fprintf(f, "%s\t%f\n", bench_id, (timing_submit+timing_exec)/1000000);
                         fclose(f);
 
                         sprintf(file, "%s/tasks_overhead_per_task_submit_execution.dat", output_dir);
                         f = fopen(file, "a");
-                        fprintf(f, "%s\t%lf\n", bench_id, (timing_submit+timing_exec)/ntasks);
+                        fprintf(f, "%s\t%f\n", bench_id, (timing_submit+timing_exec)/ntasks);
                         fclose(f);
                 }
         }

+ 1 - 1
tools/starpu_fxt_stats.c

@@ -111,7 +111,7 @@ int main(int argc, char **argv)
 		}
 	}
 
-	printf("Start : start time %le end time %le length %le\n", start_time, end_time, end_time - start_time);
+	printf("Start : start time %e end time %e length %e\n", start_time, end_time, end_time - start_time);
 
 	unsigned src, dst;
 	for (src = 0; src < 16; src++)

+ 10 - 10
tools/starpu_perfmodel_display.c

@@ -165,8 +165,8 @@ static void display_perf_model(struct starpu_perfmodel_t *model, enum starpu_per
 		if (arch_model->regression.valid)
 		{
 			fprintf(stderr, "\tLinear: y = alpha size ^ beta\n");
-			fprintf(stderr, "\t\talpha = %le\n", arch_model->regression.alpha);
-			fprintf(stderr, "\t\tbeta = %le\n", arch_model->regression.beta);
+			fprintf(stderr, "\t\talpha = %e\n", arch_model->regression.alpha);
+			fprintf(stderr, "\t\tbeta = %e\n", arch_model->regression.beta);
 		}
 		else {
 			//fprintf(stderr, "\tLinear model is INVALID\n");
@@ -175,9 +175,9 @@ static void display_perf_model(struct starpu_perfmodel_t *model, enum starpu_per
 		if (arch_model->regression.nl_valid)
 		{
 			fprintf(stderr, "\tNon-Linear: y = a size ^b + c\n");
-			fprintf(stderr, "\t\ta = %le\n", arch_model->regression.a);
-			fprintf(stderr, "\t\tb = %le\n", arch_model->regression.b);
-			fprintf(stderr, "\t\tc = %le\n", arch_model->regression.c);
+			fprintf(stderr, "\t\ta = %e\n", arch_model->regression.a);
+			fprintf(stderr, "\t\tb = %e\n", arch_model->regression.b);
+			fprintf(stderr, "\t\tc = %e\n", arch_model->regression.c);
 		}
 		else {
 			//fprintf(stderr, "\tNon-Linear model is INVALID\n");
@@ -194,27 +194,27 @@ static void display_perf_model(struct starpu_perfmodel_t *model, enum starpu_per
 	else {
 		/* only display the parameter that was specifically requested */
 		if (strcmp(parameter, "a") == 0) {
-			printf("%le\n", arch_model->regression.a);
+			printf("%e\n", arch_model->regression.a);
 			return;
 		}
 
 		if (strcmp(parameter, "b") == 0) {
-			printf("%le\n", arch_model->regression.b);
+			printf("%e\n", arch_model->regression.b);
 			return;
 		}
 
 		if (strcmp(parameter, "c") == 0) {
-			printf("%le\n", arch_model->regression.c);
+			printf("%e\n", arch_model->regression.c);
 			return;
 		}
 
 		if (strcmp(parameter, "alpha") == 0) {
-			printf("%le\n", arch_model->regression.alpha);
+			printf("%e\n", arch_model->regression.alpha);
 			return;
 		}
 
 		if (strcmp(parameter, "beta") == 0) {
-			printf("%le\n", arch_model->regression.beta);
+			printf("%e\n", arch_model->regression.beta);
 			return;
 		}
 

+ 5 - 5
tools/starpu_perfmodel_plot.c

@@ -164,8 +164,8 @@ static void display_perf_model(FILE *gnuplot_file, struct starpu_perfmodel_t *mo
 		print_comma(gnuplot_file, first);
 	
 		fprintf(stderr, "\tLinear: y = alpha size ^ beta\n");
-		fprintf(stderr, "\t\talpha = %le\n", arch_model->regression.alpha * 0.001);
-		fprintf(stderr, "\t\tbeta = %le\n", arch_model->regression.beta);
+		fprintf(stderr, "\t\talpha = %e\n", arch_model->regression.alpha * 0.001);
+		fprintf(stderr, "\t\tbeta = %e\n", arch_model->regression.beta);
 
 		fprintf(gnuplot_file, "0.001 * %f * x ** %f title \"Linear Regression %s\"",
 			arch_model->regression.alpha, arch_model->regression.beta, arch_name);
@@ -176,9 +176,9 @@ static void display_perf_model(FILE *gnuplot_file, struct starpu_perfmodel_t *mo
 		print_comma(gnuplot_file, first);
 	
 		fprintf(stderr, "\tNon-Linear: y = a size ^b + c\n");
-		fprintf(stderr, "\t\ta = %le\n", arch_model->regression.a * 0.001);
-		fprintf(stderr, "\t\tb = %le\n", arch_model->regression.b);
-		fprintf(stderr, "\t\tc = %le\n", arch_model->regression.c * 0.001);
+		fprintf(stderr, "\t\ta = %e\n", arch_model->regression.a * 0.001);
+		fprintf(stderr, "\t\tb = %e\n", arch_model->regression.b);
+		fprintf(stderr, "\t\tc = %e\n", arch_model->regression.c * 0.001);
 
 		fprintf(gnuplot_file, "0.001 * %f * x ** %f + 0.001 * %f title \"Non-Linear Regression %s\"",
 			arch_model->regression.a, arch_model->regression.b,  arch_model->regression.c, arch_name);