Browse Source

small modifs for benches

Andra Hugo 14 years ago
parent
commit
bb75e66731

+ 4 - 4
examples/cholesky_and_lu/cholesky/cholesky_tile_tag.c

@@ -228,7 +228,7 @@ int run_cholesky_tile_tag(struct starpu_sched_ctx *sched_ctx, int argc, char **a
 	parse_args(argc, argv);
 	assert(nblocks <= NMAXBLOCKS);
 
-	fprintf(stderr, "BLOCK SIZE = %d\n", size / nblocks);
+	//	fprintf(stderr, "BLOCK SIZE = %d\n", size / nblocks);
 
 	//	starpu_init(NULL);
 
@@ -306,11 +306,11 @@ int finish_cholesky_tile_tag(){
 	gettimeofday(&end, NULL);
 
 	double timing = (double)((end.tv_sec - start.tv_sec)*1000000 + (end.tv_usec - start.tv_usec));
-	fprintf(stderr, "Computation took (in ms)\n");
-	printf("%2.2f\n", timing/1000);
+	//	fprintf(stderr, "Computation took (in ms)\n");
+	printf("%2.2f ", timing/1000);
 
 	double flop = (1.0f*size*size*size)/3.0f;
-	fprintf(stderr, "Synthetic GFlops : %2.2f\n", (flop/timing/1000.0f));
+	//	fprintf(stderr, "Synthetic GFlops : %2.2f\n", (flop/timing/1000.0f));
 
 	return 0;
 }

+ 13 - 0
examples/cholesky_and_lu/cholesky_and_lu.c

@@ -3,6 +3,10 @@
 
 int main(int argc, char **argv)
 {
+  struct timeval start;
+  struct timeval end;
+  gettimeofday(&start, NULL);
+
   starpu_init(NULL);
 
   struct starpu_sched_ctx sched_ctx;
@@ -22,6 +26,15 @@ int main(int argc, char **argv)
   //starpu_task_wait_for_all();
 
   starpu_shutdown();
+
+  gettimeofday(&end, NULL);
+
+  double timing = (double)((end.tv_sec - start.tv_sec)*1000000 + (end.tv_usec - start.tv_usec));
+  //      fprintf(stderr, "Computation took (in ms)\n");                                          
+  printf("%2.2f\n", timing/1000);
+
+  double flop = (1.0f*size*size*size)/3.0f;
+  //      fprintf(stderr, "Synthetic GFlops : %2.2f\n", (flop/timing/1000.0f));               
   
   return 0;
 }

+ 3 - 3
examples/cholesky_and_lu/lu/xlu.c

@@ -244,12 +244,12 @@ void finish_lu_decomposition(unsigned nblocks)
 	gettimeofday(&xlu_end, NULL);
 
 	double timing = (double)((xlu_end.tv_sec - xlu_start.tv_sec)*1000000 + (xlu_end.tv_usec - xlu_start.tv_usec));
-	fprintf(stderr, "Computation took (in ms)\n");
-	printf("%2.2f\n", timing/1000);
+	//	fprintf(stderr, "Computation took (in ms)\n");
+	printf("%2.2f ", timing/1000);
 
 	unsigned n = starpu_matrix_get_nx(xlu_dataA);
 	double flop = (2.0f*n*n*n)/3.0f;
-	fprintf(stderr, "Synthetic GFlops : %2.2f\n", (flop/timing/1000.0f));
+	//	fprintf(stderr, "Synthetic GFlops : %2.2f\n", (flop/timing/1000.0f));
 
 	/* gather all the data */
 	starpu_data_unpartition(xlu_dataA, 0);

+ 6 - 6
examples/cholesky_and_lu/lu/xlu_pivot.c

@@ -398,12 +398,12 @@ void finish_lu_decomposition_pivot(unsigned nblocks)
 
 	double timing = (double)((&xlu_pivot_end.tv_sec - &xlu_pivot_start.tv_sec)*1000000 + (&xlu_pivot_end.tv_usec - &xlu_pivot_start.tv_usec));
 
-	fprintf(stderr, "Computation took (in ms)\n");
-	fprintf(stderr, "%2.2f\n", timing/1000);
+	//	fprintf(stderr, "Computation took (in ms)\n");
+	fprintf(stderr, "%2.2f ", timing/1000);
 
 	unsigned n = starpu_matrix_get_nx(xlu_pivot_dataA);
 	double flop = (2.0f*n*n*n)/3.0f;
-	fprintf(stderr, "Synthetic GFlops : %2.2f\n", (flop/timing/1000.0f));
+	//	fprintf(stderr, "Synthetic GFlops : %2.2f\n", (flop/timing/1000.0f));
 
 	/* gather all the data */
 	starpu_data_unpartition(xlu_pivot_dataA, 0);
@@ -434,12 +434,12 @@ void finish_lu_decomposition_pivot_no_stride(unsigned nblocks)
 
 	double timing = (double)((&xlu_pivot_no_stride_end.tv_sec - &xlu_pivot_no_stride_start.tv_sec)*1000000 + (&xlu_pivot_no_stride_end.tv_usec - &xlu_pivot_no_stride_start.tv_usec));
 
-	fprintf(stderr, "Computation took (in ms)\n");
-	fprintf(stderr, "%2.2f\n", timing/1000);
+	//	fprintf(stderr, "Computation took (in ms)\n");
+	fprintf(stderr, "%2.2f ", timing/1000);
 
 	unsigned n = starpu_matrix_get_nx(xlu_pivot_dataAp[0])*nblocks;
 	double flop = (2.0f*n*n*n)/3.0f;
-	fprintf(stderr, "Synthetic GFlops : %2.2f\n", (flop/timing/1000.0f));
+	//	fprintf(stderr, "Synthetic GFlops : %2.2f\n", (flop/timing/1000.0f));
 
 	unsigned bi, bj;
 	for (bj = 0; bj < nblocks; bj++)