[llvm-commits] [test-suite] r105235 - in /test-suite/trunk/MultiSource/Benchmarks/PAQ8p: Makefile paq8p.cpp paq8p.reference_output paq8p.reference_output.small

Daniel Dunbar daniel at zuster.org
Mon May 31 11:49:24 PDT 2010


Author: ddunbar
Date: Mon May 31 13:49:24 2010
New Revision: 105235

URL: http://llvm.org/viewvc/llvm-project?rev=105235&view=rev
Log:
Fix PAQ8p to not print # of bytes used message, which isn't consistent across
platforms.

Modified:
    test-suite/trunk/MultiSource/Benchmarks/PAQ8p/Makefile
    test-suite/trunk/MultiSource/Benchmarks/PAQ8p/paq8p.cpp
    test-suite/trunk/MultiSource/Benchmarks/PAQ8p/paq8p.reference_output
    test-suite/trunk/MultiSource/Benchmarks/PAQ8p/paq8p.reference_output.small

Modified: test-suite/trunk/MultiSource/Benchmarks/PAQ8p/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/PAQ8p/Makefile?rev=105235&r1=105234&r2=105235&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/PAQ8p/Makefile (original)
+++ test-suite/trunk/MultiSource/Benchmarks/PAQ8p/Makefile Mon May 31 13:49:24 2010
@@ -9,10 +9,4 @@
 RUN_OPTIONS = -4 file1.in
 endif
 
-ifeq ($(ARCH),x86)
-ifdef USE_REFERENCE_OUTPUT
-EXEC_XFAILS = PAQ8p
-endif
-endif
-
 include $(LEVEL)/MultiSource/Makefile.multisrc

Modified: test-suite/trunk/MultiSource/Benchmarks/PAQ8p/paq8p.cpp
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/PAQ8p/paq8p.cpp?rev=105235&r1=105234&r2=105235&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/PAQ8p/paq8p.cpp (original)
+++ test-suite/trunk/MultiSource/Benchmarks/PAQ8p/paq8p.cpp Mon May 31 13:49:24 2010
@@ -677,10 +677,7 @@
     assert(sizeof(int)==4);
   }
   void print() const {  // print time and memory used
-#ifdef LLVM
-    printf("used %d bytes of memory\n",
-      maxmem);
-#else
+#ifndef LLVM
     printf("Time %1.2f sec, used %d bytes of memory\n",
       double(clock()-start_time)/CLOCKS_PER_SEC, maxmem);
 #endif

Modified: test-suite/trunk/MultiSource/Benchmarks/PAQ8p/paq8p.reference_output
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/PAQ8p/paq8p.reference_output?rev=105235&r1=105234&r2=105235&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/PAQ8p/paq8p.reference_output (original)
+++ test-suite/trunk/MultiSource/Benchmarks/PAQ8p/paq8p.reference_output Mon May 31 13:49:24 2010
@@ -1,8 +1,6 @@
 Creating archive file1.in.paq8p with 1 file(s)...
 file1.in 262144 ->         4096        8192       12288       16384       20480       24576       28672       32768       36864       40960       45056       49152       53248       57344       61440       65536       69632       73728       77824       81920       86016       90112       94208       98304      102400      106496      110592      114688      118784      122880      126976      131072      135168      139264      143360      147456      151552      155648      159744      163840      1679
 36      172032      176128      180224      184320      188416      192512      196608      200704      204800      208896      212992      217088      221184      225280      229376      233472      237568      241664      245760      249856      253952      258048      262144262371      
 262144 -> 262400
-used 133127914 bytes of memory
 Extracting 1 file(s) from file1.in.paq8p -4
 Comparing ./file1.in 262144 ->         4096        8192       12288       16384       20480       24576       28672       32768       36864       40960       45056       49152       53248       57344       61440       65536       69632       73728       77824       81920       86016       90112       94208       98304      102400      106496      110592      114688      118784      122880      126976      131072      135168      139264      143360      147456      151552      155648      159744      163840
       167936      172032      176128      180224      184320      188416      192512      196608      200704      204800      208896      212992      217088      221184      225280      229376      233472      237568      241664      245760      249856      253952      258048identical   
-used 133127942 bytes of memory
 exit 0

Modified: test-suite/trunk/MultiSource/Benchmarks/PAQ8p/paq8p.reference_output.small
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/PAQ8p/paq8p.reference_output.small?rev=105235&r1=105234&r2=105235&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Benchmarks/PAQ8p/paq8p.reference_output.small (original)
+++ test-suite/trunk/MultiSource/Benchmarks/PAQ8p/paq8p.reference_output.small Mon May 31 13:49:24 2010
@@ -1,8 +1,6 @@
 Creating archive file1.in.paq8p with 1 file(s)...
 file1.in 262144 ->         4096        8192       12288       16384       20480       24576       28672       32768       36864       40960       45056       49152       53248       57344       61440       65536       69632       73728       77824       81920       86016       90112       94208       98304      102400      106496      110592      114688      118784      122880      126976      131072      135168      139264      143360      147456      151552      155648      159744      163840      1679
 36      172032      176128      180224      184320      188416      192512      196608      200704      204800      208896      212992      217088      221184      225280      229376      233472      237568      241664      245760      249856      253952      258048      262144262360      
 262144 -> 262389
-used 38870318 bytes of memory
 Extracting 1 file(s) from file1.in.paq8p -1
 Comparing ./file1.in 262144 ->         4096        8192       12288       16384       20480       24576       28672       32768       36864       40960       45056       49152       53248       57344       61440       65536       69632       73728       77824       81920       86016       90112       94208       98304      102400      106496      110592      114688      118784      122880      126976      131072      135168      139264      143360      147456      151552      155648      159744      163840
       167936      172032      176128      180224      184320      188416      192512      196608      200704      204800      208896      212992      217088      221184      225280      229376      233472      237568      241664      245760      249856      253952      258048identical   
-used 38870346 bytes of memory
 exit 0





More information about the llvm-commits mailing list