[MLton-devel] cvs commit: benchmarks now run longer

Stephen Weeks sweeks@users.sourceforge.net
Fri, 27 Sep 2002 16:46:30 -0700


sweeks      02/09/27 16:46:30

  Modified:    benchmark/tests DLXSimulator.sml barnes-hut.sml boyer.sml
                        checksum.sml count-graphs.sml fft.sml fib.sml
                        hamlet.sml imp-for.sml knuth-bendix.sml lexgen.sml
                        life.sml logic.sml mandelbrot.sml
                        matrix-multiply.sml md5.sml merge.sml mlyacc.sml
                        model-elimination.sml mpuz.sml nucleic.sml peek.sml
                        psdes-random.sml ratio-regions.sml ray.sml
                        raytrace.sml simple.sml smith-normal-form.sml
                        tailfib.sml tak.sml tensor.sml tsp.sml tyan.sml
                        vector-concat.sml vector-rev.sml vliw.sml
                        wc-input1.sml wc-scanStream.sml zebra.sml zern.sml
  Log:
  Made benchmarks run for longer, either by modifying the problem size or the
  repeat count.
  
  Also, updated my email address.

Revision  Changes    Path
1.2       +20 -7     mlton/benchmark/tests/DLXSimulator.sml

Index: DLXSimulator.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/DLXSimulator.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DLXSimulator.sml	18 Jul 2001 05:51:04 -0000	1.1
+++ DLXSimulator.sml	27 Sep 2002 23:46:28 -0000	1.2
@@ -1,4 +1,4 @@
-(* Minor tweaks by Stephen Weeks (sweeks@acm.org) on 2001-07-17 to turn into a
+(* Minor tweaks by Stephen Weeks (sweeks@sweeks.com) on 2001-07-17 to turn into a
  * benchmark.
  * Added rand function.
  *)
@@ -2510,7 +2510,7 @@
 	| PerformJType ((TRAP, 0wx00000003 : Word32.word), (PC, rf, mem)) 
 	  = let
 	      val x = TextIO.print "Value? ";
-	      val s = TextIO.inputLine TextIO.stdIn;
+	      val s = "10" (* TextIO.inputLine TextIO.stdIn; *)
 	      val i = Int.fromString s;
 	      val input = if isSome i
 			    then valOf i
@@ -2824,9 +2824,22 @@
 
 structure Main =
    struct
-      fun doit 0 = ()
-	| doit n = (DLXSimulatorC1.run_prog Simple;
-		    doit (n - 1))
-
-      val doit = fn () => doit 500
+      fun doit () =
+	 (DLXSimulatorC1.run_prog Simple
+	  ; DLXSimulatorC1.run_prog Twos
+	  ; DLXSimulatorC1.run_prog Abs
+	  ; DLXSimulatorC1.run_prog Fact
+	  ; DLXSimulatorC1.run_prog GCD
+	  )
+
+      val doit =
+	 fn () =>
+	 let
+	    fun loop n =
+	       if n = 0
+		  then ()
+	       else (doit();
+		     loop(n-1))
+	 in loop 50
+	 end
    end



1.2       +2 -12     mlton/benchmark/tests/barnes-hut.sml

Index: barnes-hut.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/barnes-hut.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- barnes-hut.sml	18 Jul 2001 05:51:03 -0000	1.1
+++ barnes-hut.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -1240,21 +1240,11 @@
 	  M3.srand 123;
 	  M3.go {
 	      output = fn _ => (),
-	      bodies = M3.testdata 128,
+	      bodies = M3.testdata 4096,
 	      tnow = 0.0, tstop = 2.0,
 	      dtime = 0.025, eps = 0.05, tol = 1.0,
 	      rmin = M3.S.V.tabulate (fn _ => ~2.0),
 	      rsize = 4.0
 	    })
-
-    val doit =
-       fn () =>
-       let
-	  fun loop n =
-	     if n = 0
-		then ()
-	     else (doit();
-		   loop(n-1))
-       in loop 10
-       end
   end;
+



1.2       +1 -3      mlton/benchmark/tests/boyer.sml

Index: boyer.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/boyer.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- boyer.sml	4 Jun 2002 19:21:44 -0000	1.1
+++ boyer.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -926,8 +926,6 @@
 	        then ()
 	     else (Main.doit ();
 		   loop(n-1))
-       in loop 50
+       in loop 1500
        end
   end;
-
-val _ = Main.doit()



1.2       +1 -1      mlton/benchmark/tests/checksum.sml

Index: checksum.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/checksum.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- checksum.sml	18 Jul 2001 05:51:03 -0000	1.1
+++ checksum.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -1,4 +1,4 @@
-(* Author: sweeks@acm.org
+(* Author: sweeks@sweeks.com
  * This code is based on the following paper.
  * The Performance of FoxNet 2.0
  * Herb Derby



1.2       +2 -2      mlton/benchmark/tests/count-graphs.sml

Index: count-graphs.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/count-graphs.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- count-graphs.sml	18 Jul 2001 05:51:03 -0000	1.1
+++ count-graphs.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -522,7 +522,7 @@
    structure Main =
       struct
 	 fun doit() =
-	    List.app doOne ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]
+	    List.app doOne ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11"]
 
 	 val doit =
 	    fn () =>
@@ -532,6 +532,6 @@
 		     then ()
 		  else (doit();
 			loop(n-1))
-	    in loop 10
+	    in loop 3
 	    end
       end



1.2       +2 -2      mlton/benchmark/tests/fft.sml

Index: fft.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/fft.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fft.sml	18 Jul 2001 05:51:03 -0000	1.1
+++ fft.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -292,7 +292,7 @@
 fun loop_np i np = if i > 15 then () else
   (test np; loop_np (i+1) (np*2))
 
-fun doit () = loop_np 1 16
+fun doit () = loop_np 1 256
 
 fun testit outstream = doit()
 
@@ -304,7 +304,7 @@
 		     then ()
 		  else (doit();
 			loop(n-1))
-	    in loop 5
+	    in loop 1
 	    end
 
 end



1.2       +1 -1      mlton/benchmark/tests/fib.sml

Index: fib.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/fib.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fib.sml	18 Jul 2001 05:51:03 -0000	1.1
+++ fib.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -6,7 +6,7 @@
 structure Main =
    struct
       fun doit () =
-	 if 39088169 <> fib 38
+	 if 701408733 <> fib 44
 	    then raise Fail "bug"
 	 else ()
    end



1.2       +2 -2      mlton/benchmark/tests/hamlet.sml

Index: hamlet.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/hamlet.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hamlet.sml	18 Jul 2001 05:51:04 -0000	1.1
+++ hamlet.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -1,6 +1,6 @@
 (*
  * 2001-2-14.
- * Stephen Weeks (sweeks@acm.org) generated this file from the hamlet SML
+ * Stephen Weeks (sweeks@sweeks.com) generated this file from the hamlet SML
  * interpreter written by Andreas Rossberg.
  * The sources are from http://www.ps.uni-sb.de/~rossberg/hamlet/hamlet.tar
  *
@@ -22895,7 +22895,7 @@
 		     val _ = Main.main' ["-x"]
 		  in loop (n - 1)
 		  end
-	    val _ = loop 5
+	    val _ = loop 50
 	 in ()
 	 end
    end



1.2       +2 -2      mlton/benchmark/tests/imp-for.sml

Index: imp-for.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/imp-for.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- imp-for.sml	5 Dec 2001 21:30:29 -0000	1.1
+++ imp-for.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -19,8 +19,8 @@
 	        for (0, 10, fn _ =>
 	        for (0, 10, fn _ =>
 	        for (0, 10, fn _ =>
+	        for (0, 10, fn _ =>
 		for (0, 10, fn _ => 
-	        for (0, 10, fn _ => 
 		for (0, 10, fn _ => 
 		     x := !x + 1)))))))
       in
@@ -28,5 +28,5 @@
 	  then raise Fail "bug"
 	  else ()
       end
-  val doit = fn () => for (0, 100, fn _ => doit ())
+  val doit = fn () => for (0, 1000, fn _ => doit ())
 end



1.2       +1 -1      mlton/benchmark/tests/knuth-bendix.sml

Index: knuth-bendix.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/knuth-bendix.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- knuth-bendix.sml	18 Jul 2001 05:51:03 -0000	1.1
+++ knuth-bendix.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -594,7 +594,7 @@
 		then ()
 	     else (doit();
 		   loop(n-1))
-       in loop 50
+       in loop 500
        end
     
     fun testit _ = ()



1.2       +1 -1      mlton/benchmark/tests/lexgen.sml

Index: lexgen.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/lexgen.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- lexgen.sml	18 Jul 2001 05:51:03 -0000	1.1
+++ lexgen.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -1318,7 +1318,7 @@
 		then ()
 	     else (doit();
 		   loop(n-1))
-       in loop 60
+       in loop 300
        end
 
     fun testit _ = LexGen.lexGen (s^"DATA/ml.lex")



1.2       +2 -2      mlton/benchmark/tests/life.sml

Index: life.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/life.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- life.sml	18 Jul 2001 05:51:03 -0000	1.1
+++ life.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -139,7 +139,7 @@
 
     fun show pr = (app (fn s => (pr s; pr "\n"))) o plot o alive
 
-    fun doit () = show (fn _ => ()) (nthgen gun 5000)
+    fun doit () = show (fn _ => ()) (nthgen gun 250000)
 
     val doit =
        fn () =>
@@ -149,7 +149,7 @@
 		then ()
 	     else (doit();
 		   loop(n-1))
-       in loop 5
+       in loop 1
        end
     
     fun testit strm = show (fn c => TextIO.output (strm, c)) (nthgen gun 50)



1.2       +1 -1      mlton/benchmark/tests/logic.sml

Index: logic.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/logic.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- logic.sml	18 Jul 2001 05:51:03 -0000	1.1
+++ logic.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -363,7 +363,7 @@
 		then ()
 	     else (doit();
 		   loop(n-1))
-       in loop 10
+       in loop 40
        end
 
   end; (* Main *)



1.2       +2 -2      mlton/benchmark/tests/mandelbrot.sml

Index: mandelbrot.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/mandelbrot.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mandelbrot.sml	18 Jul 2001 05:51:03 -0000	1.1
+++ mandelbrot.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -13,7 +13,7 @@
     val y_base = 1.25
     val side = 2.5
 
-    val sz = 4096
+    val sz = 32768
     val maxCount = 2048
 
     val delta = side / (real sz)
@@ -64,7 +64,7 @@
 		then ()
 	     else (doit();
 		   loop(n-1))
-       in loop 10
+       in loop 2
        end
     fun testit outstrm = (
 	  sum_iterations := 0;



1.3       +4 -4      mlton/benchmark/tests/matrix-multiply.sml

Index: matrix-multiply.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/matrix-multiply.sml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- matrix-multiply.sml	6 Jan 2002 21:51:39 -0000	1.2
+++ matrix-multiply.sml	27 Sep 2002 23:46:29 -0000	1.3
@@ -1,4 +1,4 @@
-(* Written by Stephen Weeks (sweeks@acm.org). *)
+(* Written by Stephen Weeks (sweeks@sweeks.com). *)
 structure Array = Array2
    
 fun 'a fold (n : int, b : 'a, f : int * 'a -> 'a) =
@@ -37,11 +37,11 @@
    struct
       fun doit () =
 	 let
-	    val dim = 200
+	    val dim = 1000
 	    val a = Array.tabulate Array.RowMajor (dim, dim, fn (r, c) =>
 						   Real.fromInt (r + c))
 	 in
-	    if Real.== (2646700.0, Array2.sub (mult (a, a), 0, 0))
+	    if Real.== (332833500.0, Array2.sub (mult (a, a), 0, 0))
 	       then ()
 	    else raise Fail "bug"
 	 end
@@ -54,6 +54,6 @@
 		  then ()
 	       else (doit ();
 		     loop (n-1))
-	 in loop 10
+	 in loop 1
 	 end
    end



1.2       +2 -2      mlton/benchmark/tests/md5.sml

Index: md5.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/md5.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- md5.sml	18 Jul 2001 05:51:04 -0000	1.1
+++ md5.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -243,8 +243,8 @@
       end
     in List.app f tests
     end
-    val BLOCK_LEN = 1000
-    val BLOCK_COUNT = 100000
+    val BLOCK_LEN = 10000
+    val BLOCK_COUNT = 1000000
     fun time_test () = let
       val block = Word8Vector.tabulate (BLOCK_LEN,Word8.fromInt)
       fun loop (n,s) =



1.2       +2 -3      mlton/benchmark/tests/merge.sml

Index: merge.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/merge.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- merge.sml	18 Jul 2001 05:51:04 -0000	1.1
+++ merge.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -1,4 +1,4 @@
-(* Written by Stephen Weeks (sweeks@acm.org). *)
+(* Written by Stephen Weeks (sweeks@sweeks.com). *)
 fun merge (l1: int list, l2) =
    case (l1, l2) of
       ([], _) => l2
@@ -25,7 +25,6 @@
 	       if n = 0
 		  then ()
 	       else (test (); loop (n - 1))
-	 in loop 1000
+	 in loop 2000
 	 end
    end
-	    



1.2       +1 -1      mlton/benchmark/tests/mlyacc.sml

Index: mlyacc.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/mlyacc.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mlyacc.sml	18 Jul 2001 05:51:03 -0000	1.1
+++ mlyacc.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -7286,7 +7286,7 @@
 		then ()
 	     else (ParseGen.parseGen(s^"/DATA/ml.grm");
 		   loop(n - 1))
-       in loop 100
+       in loop 500
        end
     fun testit _ = ParseGen.parseGen(s^"/DATA/ml.grm")
   end



1.2       +0 -2      mlton/benchmark/tests/model-elimination.sml

Index: model-elimination.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/model-elimination.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- model-elimination.sml	25 Sep 2002 19:44:19 -0000	1.1
+++ model-elimination.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -8794,5 +8794,3 @@
 val doit = main
 
 end
-
-val _ = Main.doit



1.2       +2 -2      mlton/benchmark/tests/mpuz.sml

Index: mpuz.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/mpuz.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mpuz.sml	18 Jul 2001 05:51:03 -0000	1.1
+++ mpuz.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -1,5 +1,5 @@
 (*
- * Written by sweeks@acm.org on 1999-08-31.
+ * Written by sweeks@sweeks.com on 1999-08-31.
  *
  * A solution to mpuz. (Try M-x mpuz in emacs.)
  * This solution is very loosely based on an OCAML solution posted to
@@ -135,6 +135,6 @@
 		  then ()
 	       else (doit();
 		     loop(n-1))
-	 in loop 2
+	 in loop 20
 	 end
    end



1.2       +1 -1      mlton/benchmark/tests/nucleic.sml

Index: nucleic.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/nucleic.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nucleic.sml	18 Jul 2001 05:51:03 -0000	1.1
+++ nucleic.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -3215,7 +3215,7 @@
 		then ()
 	     else (doit();
 		   loop(n-1))
-       in loop 200
+       in loop 1500
        end
     fun testit strm = TextIO.output(strm, concat[
 	    Int.toString (Nucleic.anticodon_length ()), "\n"



1.2       +2 -2      mlton/benchmark/tests/peek.sml

Index: peek.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/peek.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- peek.sml	18 Jul 2001 05:51:04 -0000	1.1
+++ peek.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -1,4 +1,4 @@
-(* Written by Stephen Weeks (sweeks@acm.org). *)
+(* Written by Stephen Weeks (sweeks@sweeks.com). *)
 structure Plist:
    sig
       type t
@@ -50,6 +50,6 @@
 	       if i = 0
 		  then ()
 	       else (inner (); loop (i - 1))
-	 in loop 20
+	 in loop 1000
 	 end
    end



1.2       +3 -3      mlton/benchmark/tests/psdes-random.sml

Index: psdes-random.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/psdes-random.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- psdes-random.sml	18 Jul 2001 05:51:03 -0000	1.1
+++ psdes-random.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -1,4 +1,4 @@
-(* Written by Stephen Weeks (sweeks@acm.org). *)
+(* Written by Stephen Weeks (sweeks@sweeks.com). *)
 (*
  * Random number generator based on page 302 of Numerical Recipes in C.
  *)
@@ -59,10 +59,10 @@
 	    fun loop (i, w) =
 	       if i = 0
 		  then
-		     if w = 0wxEAD56832
+		     if w = 0wx2373ABE5
 			then ()
 		     else raise Fail "bug"
 	       else loop (i - 1, w + word())
-	 in loop (50000000, 0w0)
+	 in loop (500000000, 0w0)
 	 end
    end



1.2       +4 -3      mlton/benchmark/tests/ratio-regions.sml

Index: ratio-regions.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/ratio-regions.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ratio-regions.sml	18 Jul 2001 05:51:03 -0000	1.1
+++ ratio-regions.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -1,5 +1,6 @@
 (*
- * Translated from Jeff Siskind's Scheme code by Stephen Weeks (sweeks@acm.org).
+ * Translated from Jeff Siskind's Scheme code by Stephen Weeks
+ * (sweeks@sweeks.com).
  * Here is the description from Jeff Siskind (qobi@research.nj.nec.com)
  *
  * It is an implementation of Ratio
@@ -586,8 +587,8 @@
 in
 
 fun doit() = 
-   let val height = 256
-      val width = 256
+   let val height = 512
+      val width = 512
       val lg_max_v = 15
       val c_right = make_matrix(height, width - 1, ~1)
       val c_down = make_matrix(height - 1, width, ~1)



1.2       +1 -1      mlton/benchmark/tests/ray.sml

Index: ray.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/ray.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ray.sml	18 Jul 2001 05:51:03 -0000	1.1
+++ ray.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -452,7 +452,7 @@
 		   loop (n - 1)
 		end
        in
-	  loop 10
+	  loop 100
        end
 
     fun testit _ = ()



1.3       +13 -3     mlton/benchmark/tests/raytrace.sml

Index: raytrace.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/raytrace.sml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- raytrace.sml	30 Mar 2002 02:36:28 -0000	1.2
+++ raytrace.sml	27 Sep 2002 23:46:29 -0000	1.3
@@ -1,6 +1,6 @@
 (*
- * Translated by Stephen Weeks (sweeks@acm.org) 2000-10-11 from the PLClub OCaml
- * winning entry to the 2000 ICFP programming contest.
+ * Translated by Stephen Weeks (sweeks@sweeks.com) 2000-10-11 from the
+ * PLClub OCaml winning entry to the 2000 ICFP programming contest.
  *)
 
 (* raytrace.sml *)
@@ -2373,5 +2373,15 @@
       fun doit () =
 	 Eval.f (Program.read (TextIO.openIn "DATA/chess.gml"))
 	 handle _ => ()
-   end
 
+      val doit =
+	 fn () =>
+	 let
+	    fun loop n =
+	       if n = 0
+		  then ()
+	       else (doit();
+		     loop(n-1))
+	 in loop 10
+	 end
+   end



1.2       +1 -1      mlton/benchmark/tests/simple.sml

Index: simple.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/simple.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- simple.sml	18 Jul 2001 05:51:03 -0000	1.1
+++ simple.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -923,7 +923,7 @@
 		then ()
 	     else (doit();
 		   loop(n-1))
-       in loop 10
+       in loop 100
        end
 
 



1.2       +5 -4      mlton/benchmark/tests/smith-normal-form.sml

Index: smith-normal-form.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/smith-normal-form.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smith-normal-form.sml	18 Jul 2001 05:51:03 -0000	1.1
+++ smith-normal-form.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -379,11 +379,12 @@
 structure Main =
    struct
       fun snf() =
-	 let val dim = 32
+	 let val dim = 41
 	    val big = Matrix.map (Matrix.make (dim, dim, f), IntInf.fromInt)
-	 in if valOf(IntInf.fromString
-		     "~8074709755269798283190497453463562613129")
-	    = Matrix.fetch(smithNormalForm big, dim - 1, dim - 1)
+	    val entry = Matrix.fetch(smithNormalForm big, dim - 1, dim - 1)
+(*	    val _ = print (concat [IntInf.toString entry, "\n"]) *)
+	 in if entry = valOf (IntInf.fromString
+			      "~5982287446743594366320025265358994041861754680646118986")
 	       then ()
 	    else raise Fail "bug"
 	 end



1.2       +2 -2      mlton/benchmark/tests/tailfib.sml

Index: tailfib.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/tailfib.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tailfib.sml	19 Jul 2001 18:10:37 -0000	1.1
+++ tailfib.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -6,7 +6,7 @@
 structure Main =
    struct
       fun doit() =
-	 if 39088169 <> fib 38
+	 if 701408733 <> fib 44
 	    then raise Fail "bug"
 	 else ()
 
@@ -18,6 +18,6 @@
 	      then ()
 	      else (doit();
 		    loop(n-1))
-	in loop 50000000
+	in loop 200000000
 	end
    end



1.2       +2 -3      mlton/benchmark/tests/tak.sml

Index: tak.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/tak.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tak.sml	18 Jul 2001 05:51:03 -0000	1.1
+++ tak.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -7,10 +7,9 @@
 
 val rec f =
    fn 0 => ()
-    | n => (tak (18,12,6); f (n-1))
+    | n => (tak (36,24,12); f (n-1))
 
 structure Main =
    struct
-      fun doit () = f 5000
+      fun doit () = f 1
    end
-



1.2       +2 -3      mlton/benchmark/tests/tensor.sml

Index: tensor.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/tensor.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tensor.sml	18 Jul 2001 05:51:03 -0000	1.1
+++ tensor.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -2925,7 +2925,7 @@
 		  fun constructor size = RTensor.new([size,size],1.0)
 	       in
 		  print "Real tensors: (+, *, /, +*, *+)\n";
-		  test_operator constructor operators [100,200,300];
+		  test_operator constructor operators [100,200,300,400,500,600];
 		  print "\n\n"
 	       end
 	    
@@ -2936,10 +2936,9 @@
 	    fun constructor size = CTensor.new([size,size],CNumber.one)
 	 in
 	    print "Real tensors: (+, *, /, +*, *+)\n";
-	    test_operator constructor operators [100,200,300];
+	    test_operator constructor operators [100,200,300,400,500,600];
 	    print "\n\n"
 	 end
 	 in ()
 	 end
    end
-



1.2       +2 -1      mlton/benchmark/tests/tsp.sml

Index: tsp.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/tsp.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tsp.sml	18 Jul 2001 05:51:03 -0000	1.1
+++ tsp.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -475,6 +475,7 @@
 
     fun testit strm = printLength (strm, doit' (!problemSz))
 
+    val _ = problemSz := 2097151
     fun doit () = doit' (!problemSz)
 
     val doit =
@@ -485,7 +486,7 @@
 		then ()
 	     else (doit();
 		   loop(n-1))
-       in loop 30
+       in loop 4
        end
 
   end



1.2       +2 -2      mlton/benchmark/tests/tyan.sml

Index: tyan.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/tyan.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tyan.sml	3 Oct 2001 19:06:16 -0000	1.1
+++ tyan.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -1,4 +1,4 @@
-(* Modified by sweeks@acm.org 2001-10-03 to go in the MLton benchmark suite.
+(* Modified by sweeks@sweeks.com 2001-10-03 to go in the MLton benchmark suite.
  * Hardwired in the u6 list of polynomials and added a loop.
  *)
 (* tyan.sml
@@ -1011,6 +1011,6 @@
 		  then ()
 	       else (gb u6; loop (n - 1))
 	 in
-	    loop 20
+	    loop 80
 	 end
    end



1.2       +2 -2      mlton/benchmark/tests/vector-concat.sml

Index: vector-concat.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/vector-concat.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vector-concat.sml	18 Jul 2001 05:51:04 -0000	1.1
+++ vector-concat.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -1,10 +1,10 @@
-(* Written by Stephen Weeks (sweeks@acm.org). *)
+(* Written by Stephen Weeks (sweeks@sweeks.com). *)
 
 structure Main =
    struct
       fun doit () =
 	 let
-	    val len = 1000
+	    val len = 20000
 	    val sum = len * (len - 1)
 	    val v = Vector.tabulate (len, fn i => i)
 	    fun loop n =



1.2       +2 -2      mlton/benchmark/tests/vector-rev.sml

Index: vector-rev.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/vector-rev.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vector-rev.sml	18 Jul 2001 05:51:04 -0000	1.1
+++ vector-rev.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -1,4 +1,4 @@
-(* Written by Stephen Weeks (sweeks@acm.org). *)
+(* Written by Stephen Weeks (sweeks@sweeks.com). *)
 
 structure Main =
    struct
@@ -13,7 +13,7 @@
 
       fun doit () =
 	 let
-	    val v = tabulate (10000, fn i => i)
+	    val v = tabulate (200000, fn i => i)
 	    fun loop n =
 	       if n < 0
 		  then ()



1.2       +1 -1      mlton/benchmark/tests/vliw.sml

Index: vliw.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/vliw.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vliw.sml	18 Jul 2001 05:51:03 -0000	1.1
+++ vliw.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -3688,6 +3688,6 @@
 		     then ()
 		  else (doit();
 			loop(n-1))
-	    in loop 15
+	    in loop 150
 	    end
    end



1.2       +3 -3      mlton/benchmark/tests/wc-input1.sml

Index: wc-input1.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/wc-input1.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wc-input1.sml	18 Jul 2001 05:51:04 -0000	1.1
+++ wc-input1.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -1,4 +1,4 @@
-(* Written by Stephen Weeks (sweeks@acm.org). *)
+(* Written by Stephen Weeks (sweeks@sweeks.com). *)
 
 structure Main =
    struct
@@ -21,14 +21,14 @@
 			NONE => i
 		      | SOME c => loop (if c = #"\n" then i + 1 else i)
 		  val n = loop 0
-		  val _ = print (concat [Int.toString n, " newlines\n"])
+		  val _ = if n <> 100000 then raise Fail "bug" else ()
 		  val _ = closeIn ins
 	       in n
 	       end
 	    val rec loop =
 	       fn 0 => ()
 		| n => (wc f; loop (n - 1))
-	    val _ = loop 90
+	    val _ = loop 4000
 	    val _ = OS.FileSys.remove f
 	 in ()
 	 end



1.2       +5 -4      mlton/benchmark/tests/wc-scanStream.sml

Index: wc-scanStream.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/wc-scanStream.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wc-scanStream.sml	18 Jul 2001 05:51:04 -0000	1.1
+++ wc-scanStream.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -1,4 +1,4 @@
-(* Written by Stephen Weeks (sweeks@acm.org). *)
+(* Written by Stephen Weeks (sweeks@sweeks.com). *)
 
 structure Main =
    struct
@@ -22,8 +22,9 @@
 		      fun loop (s, ns) =
 			 case reader s of
 			    NONE => (closeIn ins
-				     ; print (concat [Int.toString ns,
-						    " newlines\n"])
+				     ; if ns <> 100000
+					  then raise Fail "bug"
+				       else ()
 				     ; NONE)
 			  | SOME (c, s') =>
 			       loop (s', if c = #"\n" then ns + 1 else ns)
@@ -34,7 +35,7 @@
 	    val rec loop =
 	       fn 0 => ()
 		| n => (wc f; loop (n - 1))
-	    val _ = loop 90
+	    val _ = loop 3000
 	    val _ = OS.FileSys.remove f
 	 in ()
 	 end



1.2       +2 -2      mlton/benchmark/tests/zebra.sml

Index: zebra.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/zebra.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zebra.sml	18 Jul 2001 05:51:04 -0000	1.1
+++ zebra.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -1,4 +1,4 @@
-(* Copyright Stephen Weeks (sweeks@acm.org).  1999-6-21.
+(* Copyright Stephen Weeks (sweeks@sweeks.com).  1999-6-21.
  *
  * This code solves the following "zebra" puzzle, and prints the solution.
  * There are 120^5 ~= 24 billion possibilities, so exhaustive search should
@@ -293,6 +293,6 @@
 		  then ()
 	       else (search ()
 		     ; loop (n - 1))
-	 in loop 500
+	 in loop 15000
 	 end
    end



1.2       +1 -1      mlton/benchmark/tests/zern.sml

Index: zern.sml
===================================================================
RCS file: /cvsroot/mlton/mlton/benchmark/tests/zern.sml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zern.sml	18 Jul 2001 05:51:03 -0000	1.1
+++ zern.sml	27 Sep 2002 23:46:29 -0000	1.2
@@ -600,5 +600,5 @@
 
 structure Main =
    struct
-      fun doit() = MSpeed.ztest 1000
+      fun doit() = MSpeed.ztest 2000
    end





-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
MLton-devel mailing list
MLton-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mlton-devel