[llvm-commits] [test-suite] r105366 - in /test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Large: Makefile sphereflake.cpp sphereflake.reference_output sphereflake.reference_output.small

[Daniel Dunbar]

Author: ddunbar
Date: Wed Jun  2 19:07:29 2010
New Revision: 105366

URL: http://llvm.org/viewvc/llvm-project?rev=105366&view=rev
Log:
Fix sphereflake to not print memory usage info, this fixes the x86/x86_64
reference output mismatch.

Modified:
    test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Large/Makefile
    test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Large/sphereflake.cpp
    test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Large/sphereflake.reference_output
    test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Large/sphereflake.reference_output.small

Modified: test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Large/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Misc-C%2B%2B/Large/Makefile?rev=105366&r1=105365&r2=105366&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Large/Makefile (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Large/Makefile Wed Jun  2 19:07:29 2010
@@ -4,10 +4,4 @@
 FP_ABSTOLERANCE := 0.01
 HASH_PROGRAM_OUTPUT := 1
 
-ifeq ($(ARCH),x86)
-ifdef USE_REFERENCE_OUTPUT
-EXEC_XFAILS = sphereflake
-endif
-endif
-
 include $(LEVEL)/SingleSource/Makefile.singlesrc

Modified: test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Large/sphereflake.cpp
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Misc-C%2B%2B/Large/sphereflake.cpp?rev=105366&r1=105365&r2=105366&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Large/sphereflake.cpp (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Large/sphereflake.cpp Wed Jun  2 19:07:29 2010
@@ -175,7 +175,7 @@
 	int count=childs, dec=lvl;
 	while(--dec > 1) count=(count*childs)+childs;
 	++count;
-	std::cerr << count << " spheres,claiming " << (count*sizeof(node_t))/(1024.*1024) << " MB." << std::endl;
+	std::cerr << count << " spheres.";
 	pool=new node_t[count];  /* raw */
 	end=pool+count;
 	create(pool,lvl,count,v_t(0,0,0),v_t(+.25,+1,-.5).norm(),1.); /* cooked */

Modified: test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Large/sphereflake.reference_output
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Misc-C%2B%2B/Large/sphereflake.reference_output?rev=105366&r1=105365&r2=105366&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Large/sphereflake.reference_output (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Large/sphereflake.reference_output Wed Jun  2 19:07:29 2010
@@ -1 +1 @@
-59fc4bd115591a0cab910c07e4f1e347
+5a973a1f0583225a283e1c0a54f30a62

Modified: test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Large/sphereflake.reference_output.small
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Benchmarks/Misc-C%2B%2B/Large/sphereflake.reference_output.small?rev=105366&r1=105365&r2=105366&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Large/sphereflake.reference_output.small (original)
+++ test-suite/trunk/SingleSource/Benchmarks/Misc-C++/Large/sphereflake.reference_output.small Wed Jun  2 19:07:29 2010
@@ -1 +1 @@
-2f875590e21591117370f29b6412b149
+6c06837938f0cd3f5bd2ce2bb40203c1