[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/SciMark2-C/Makefile scimark2.c

[Chris Lattner]

Changes in directory llvm-test/MultiSource/Benchmarks/SciMark2-C:

Makefile updated: 1.1 -> 1.2
scimark2.c updated: 1.1 -> 1.2
---
Log message:

Disable timing related output to make this deterministic


---
Diffs of the changes:  (+7 -9)

Index: llvm-test/MultiSource/Benchmarks/SciMark2-C/Makefile
diff -u llvm-test/MultiSource/Benchmarks/SciMark2-C/Makefile:1.1 llvm-test/MultiSource/Benchmarks/SciMark2-C/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/SciMark2-C/Makefile:1.1	Wed Oct 20 13:13:10 2004
+++ llvm-test/MultiSource/Benchmarks/SciMark2-C/Makefile	Fri Oct 22 00:23:41 2004
@@ -7,7 +7,4 @@
 RUN_OPTIONS = -large
 endif
 
-# This program is a timing related test
-PROGRAM_IS_NONDETERMINISTIC = 1
-
 include	../../Makefile.multisrc


Index: llvm-test/MultiSource/Benchmarks/SciMark2-C/scimark2.c
diff -u llvm-test/MultiSource/Benchmarks/SciMark2-C/scimark2.c:1.1 llvm-test/MultiSource/Benchmarks/SciMark2-C/scimark2.c:1.2
--- llvm-test/MultiSource/Benchmarks/SciMark2-C/scimark2.c:1.1	Wed Oct 20 13:13:11 2004
+++ llvm-test/MultiSource/Benchmarks/SciMark2-C/scimark2.c	Fri Oct 22 00:23:41 2004
@@ -72,14 +72,15 @@
         res[0] = (res[1] + res[2] + res[3] + res[4] + res[5]) / 5;
 
         /* print out results  */
-        printf("Composite Score:        %8.2f\n" ,res[0]);
-        printf("FFT             Mflops: %8.2f    (N=%d)\n", res[1], FFT_size);
+        printf("NOTE!!! All Mflops disabled to prevent diffs from failing!\n");
+        printf("Composite Score:        %8.2f\n" ,res[0]/10000000);
+        printf("FFT             Mflops: %8.2f    (N=%d)\n", res[1]/10000000, FFT_size);
         printf("SOR             Mflops: %8.2f    (%d x %d)\n", 		
-				res[2], SOR_size, SOR_size);
-        printf("MonteCarlo:     Mflops: %8.2f\n", res[3]);
-        printf("Sparse matmult  Mflops: %8.2f    (N=%d, nz=%d)\n", res[4], 
+				res[2]/10000000, SOR_size, SOR_size);
+        printf("MonteCarlo:     Mflops: %8.2f\n", res[3]/10000000);
+        printf("Sparse matmult  Mflops: %8.2f    (N=%d, nz=%d)\n", res[4]/10000000, 
 					Sparse_size_M, Sparse_size_nz);
-        printf("LU              Mflops: %8.2f    (M=%d, N=%d)\n", res[5],
+        printf("LU              Mflops: %8.2f    (M=%d, N=%d)\n", res[5]/10000000,
 				LU_size, LU_size);