[m-rev.] diff: fix test case problems

Zoltan Somogyi zs at csse.unimelb.edu.au
Mon Jul 20 13:48:33 AEST 2009


Fix some test case failures that were causes by the test setups, not by any
bugs.

tests/debugger/dice.exp3:
	Add a new expected output for this test. I believe this is the correct
	expected output for the current HLDS form of the code from which the
	goal paths are computed. (The new .exp3 differs from the .exp2 file
	in goal paths and the resulting orderings.)

tests/tabling/fib_stats.exp2:
	Add a new expected output for this test with the expected output on 64
	bit systems. This is the same as fib_stats.exp, but with twice the
	expected memory usage.

tests/tabling/Mmakefile:
tests/tabling/specified_stats.exp:
	We used to replace up to five-digit numbers with NNNs to avoid
	depending on platform specific details. Since this is not enough,
	with differences showing up on 64 bit platforms, do this for up
	to seven-digit numbers.

Zoltan.

cvs diff: Diffing .
cvs diff: Diffing analysis
cvs diff: Diffing bindist
cvs diff: Diffing boehm_gc
cvs diff: Diffing boehm_gc/Mac_files
cvs diff: Diffing boehm_gc/cord
cvs diff: Diffing boehm_gc/cord/private
cvs diff: Diffing boehm_gc/doc
cvs diff: Diffing boehm_gc/include
cvs diff: Diffing boehm_gc/include/private
cvs diff: Diffing boehm_gc/libatomic_ops-1.2
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/doc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/hpc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/ibmc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/icc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/msftc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/src/atomic_ops/sysdeps/sunc
cvs diff: Diffing boehm_gc/libatomic_ops-1.2/tests
cvs diff: Diffing boehm_gc/tests
cvs diff: Diffing boehm_gc/windows-untested
cvs diff: Diffing boehm_gc/windows-untested/vc60
cvs diff: Diffing boehm_gc/windows-untested/vc70
cvs diff: Diffing boehm_gc/windows-untested/vc71
cvs diff: Diffing browser
cvs diff: Diffing bytecode
cvs diff: Diffing compiler
cvs diff: Diffing compiler/notes
cvs diff: Diffing debian
cvs diff: Diffing debian/patches
cvs diff: Diffing deep_profiler
cvs diff: Diffing deep_profiler/notes
cvs diff: Diffing doc
cvs diff: Diffing extras
cvs diff: Diffing extras/base64
cvs diff: Diffing extras/cgi
cvs diff: Diffing extras/complex_numbers
cvs diff: Diffing extras/complex_numbers/samples
cvs diff: Diffing extras/complex_numbers/tests
cvs diff: Diffing extras/concurrency
cvs diff: Diffing extras/curs
cvs diff: Diffing extras/curs/samples
cvs diff: Diffing extras/curses
cvs diff: Diffing extras/curses/sample
cvs diff: Diffing extras/dynamic_linking
cvs diff: Diffing extras/error
cvs diff: Diffing extras/fixed
cvs diff: Diffing extras/gator
cvs diff: Diffing extras/gator/generations
cvs diff: Diffing extras/gator/generations/1
cvs diff: Diffing extras/graphics
cvs diff: Diffing extras/graphics/easyx
cvs diff: Diffing extras/graphics/easyx/samples
cvs diff: Diffing extras/graphics/mercury_allegro
cvs diff: Diffing extras/graphics/mercury_allegro/examples
cvs diff: Diffing extras/graphics/mercury_allegro/samples
cvs diff: Diffing extras/graphics/mercury_allegro/samples/demo
cvs diff: Diffing extras/graphics/mercury_allegro/samples/mandel
cvs diff: Diffing extras/graphics/mercury_allegro/samples/pendulum2
cvs diff: Diffing extras/graphics/mercury_allegro/samples/speed
cvs diff: Diffing extras/graphics/mercury_glut
cvs diff: Diffing extras/graphics/mercury_opengl
cvs diff: Diffing extras/graphics/mercury_tcltk
cvs diff: Diffing extras/graphics/samples
cvs diff: Diffing extras/graphics/samples/calc
cvs diff: Diffing extras/graphics/samples/gears
cvs diff: Diffing extras/graphics/samples/maze
cvs diff: Diffing extras/graphics/samples/pent
cvs diff: Diffing extras/lazy_evaluation
cvs diff: Diffing extras/lex
cvs diff: Diffing extras/lex/samples
cvs diff: Diffing extras/lex/tests
cvs diff: Diffing extras/log4m
cvs diff: Diffing extras/logged_output
cvs diff: Diffing extras/moose
cvs diff: Diffing extras/moose/samples
cvs diff: Diffing extras/moose/tests
cvs diff: Diffing extras/mopenssl
cvs diff: Diffing extras/morphine
cvs diff: Diffing extras/morphine/non-regression-tests
cvs diff: Diffing extras/morphine/scripts
cvs diff: Diffing extras/morphine/source
cvs diff: Diffing extras/net
cvs diff: Diffing extras/odbc
cvs diff: Diffing extras/posix
cvs diff: Diffing extras/posix/samples
cvs diff: Diffing extras/quickcheck
cvs diff: Diffing extras/quickcheck/tutes
cvs diff: Diffing extras/references
cvs diff: Diffing extras/references/samples
cvs diff: Diffing extras/references/tests
cvs diff: Diffing extras/solver_types
cvs diff: Diffing extras/solver_types/library
cvs diff: Diffing extras/trailed_update
cvs diff: Diffing extras/trailed_update/samples
cvs diff: Diffing extras/trailed_update/tests
cvs diff: Diffing extras/windows_installer_generator
cvs diff: Diffing extras/windows_installer_generator/sample
cvs diff: Diffing extras/windows_installer_generator/sample/images
cvs diff: Diffing extras/xml
cvs diff: Diffing extras/xml/samples
cvs diff: Diffing extras/xml_stylesheets
cvs diff: Diffing java
cvs diff: Diffing java/runtime
cvs diff: Diffing library
cvs diff: Diffing mdbcomp
cvs diff: Diffing profiler
cvs diff: Diffing robdd
cvs diff: Diffing runtime
cvs diff: Diffing runtime/GETOPT
cvs diff: Diffing runtime/machdeps
cvs diff: Diffing samples
cvs diff: Diffing samples/c_interface
cvs diff: Diffing samples/c_interface/c_calls_mercury
cvs diff: Diffing samples/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/c_interface/mercury_calls_c
cvs diff: Diffing samples/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/c_interface/standalone_c
cvs diff: Diffing samples/diff
cvs diff: Diffing samples/muz
cvs diff: Diffing samples/rot13
cvs diff: Diffing samples/solutions
cvs diff: Diffing samples/solver_types
cvs diff: Diffing samples/tests
cvs diff: Diffing samples/tests/c_interface
cvs diff: Diffing samples/tests/c_interface/c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/cplusplus_calls_mercury
cvs diff: Diffing samples/tests/c_interface/mercury_calls_c
cvs diff: Diffing samples/tests/c_interface/mercury_calls_cplusplus
cvs diff: Diffing samples/tests/c_interface/mercury_calls_fortran
cvs diff: Diffing samples/tests/c_interface/simpler_c_calls_mercury
cvs diff: Diffing samples/tests/c_interface/simpler_cplusplus_calls_mercury
cvs diff: Diffing samples/tests/diff
cvs diff: Diffing samples/tests/muz
cvs diff: Diffing samples/tests/rot13
cvs diff: Diffing samples/tests/solutions
cvs diff: Diffing samples/tests/toplevel
cvs diff: Diffing scripts
cvs diff: Diffing slice
cvs diff: Diffing ssdb
cvs diff: Diffing tests
cvs diff: Diffing tests/analysis
cvs diff: Diffing tests/analysis/ctgc
cvs diff: Diffing tests/analysis/excp
cvs diff: Diffing tests/analysis/ext
cvs diff: Diffing tests/analysis/sharing
cvs diff: Diffing tests/analysis/table
cvs diff: Diffing tests/analysis/trail
cvs diff: Diffing tests/analysis/unused_args
cvs diff: Diffing tests/benchmarks
cvs diff: Diffing tests/debugger
Index: tests/debugger/dice.exp3
===================================================================
RCS file: tests/debugger/dice.exp3
diff -N tests/debugger/dice.exp3
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/debugger/dice.exp3	20 Jul 2009 03:26:45 -0000
@@ -0,0 +1,119 @@
+      E1:     C1 CALL pred dice.main/2-0 (det) dice.m:17
+mdb> mdb> Contexts will not be printed.
+mdb> echo on
+Command echo enabled.
+mdb> dice -f dice.fail -p dice.passes -m dice
+Procedure                Path/Port            File:Line Pass (3) Fail Suspicion
+pred dice.main/2-0       CALL                 dice.m:17    3 (3)    1      0.25
+pred dice.main/2-0       EXIT                 dice.m:17    3 (3)    1      0.25
+pred dice.main/2-0       <c2;?;>              dice.m:20    3 (3)    1      0.25
+pred dice.main/2-0       <c2;t;>              dice.m:22    3 (3)    1      0.25
+pred dice.merge/3-0      CALL                 dice.m:64   18 (3)    7      0.28
+pred dice.merge/3-0      EXIT                 dice.m:64   18 (3)    7      0.28
+pred dice.merge/3-0      <s1-2;>              dice.m:64    8 (3)    3      0.27
+pred dice.merge/3-0      <s2-2;>              dice.m:64   10 (3)    4      0.29
+pred dice.merge/3-0      <s2-2;c2;s2-2;>      dice.m:67   10 (3)    4      0.29
+pred dice.merge/3-0      <s1-2;s2-2;>         dice.m:66    8 (3)    3      0.27
+pred dice.merge/3-0      <s2-2;c2;s2-2;c4;?;> dice.m:69   10 (3)    4      0.29
+pred dice.merge/3-0      <s2-2;c2;s2-2;c4;t;> dice.m:71   10 (3)    3      0.23
+pred dice.merge/3-0      <s2-2;c2;s2-2;c4;e;> dice.m:74    0 (0)    1      1.00
+pred dice.merge_sort/2-0 CALL                 dice.m:31    3 (3)    1      0.25
+pred dice.merge_sort/2-0 EXIT                 dice.m:31    3 (3)    1      0.25
+pred dice.msort_n/4-0    CALL                 dice.m:37   19 (3)    7      0.27
+pred dice.msort_n/4-0    EXIT                 dice.m:37   19 (3)    7      0.27
+pred dice.msort_n/4-0    <e;t;s2-2;>          dice.m:47   11 (3)    4      0.27
+pred dice.msort_n/4-0    <?;>                 dice.m:39   19 (3)    7      0.27
+pred dice.msort_n/4-0    <e;?;>               dice.m:44   19 (3)    7      0.27
+pred dice.msort_n/4-0    <e;t;>               dice.m:50   11 (3)    4      0.27
+pred dice.msort_n/4-0    <e;>                 dice.m:54   19 (3)    7      0.27
+pred dice.msort_n/4-0    <e;e;>               dice.m:55    8 (3)    3      0.27
+mdb> fail_trace_counts dice.fail
+mdb> pass_trace_counts dice.passes
+mdb> dice -sS -m dice
+Procedure                Path/Port            File:Line Pass (3) Fail Suspicion
+pred dice.merge/3-0      <s2-2;c2;s2-2;c4;e;> dice.m:74    0 (0)    1      1.00
+pred dice.merge/3-0      <s2-2;>              dice.m:64   10 (3)    4      0.29
+pred dice.merge/3-0      <s2-2;c2;s2-2;>      dice.m:67   10 (3)    4      0.29
+pred dice.merge/3-0      <s2-2;c2;s2-2;c4;?;> dice.m:69   10 (3)    4      0.29
+pred dice.merge/3-0      CALL                 dice.m:64   18 (3)    7      0.28
+pred dice.merge/3-0      EXIT                 dice.m:64   18 (3)    7      0.28
+pred dice.merge/3-0      <s1-2;>              dice.m:64    8 (3)    3      0.27
+pred dice.merge/3-0      <s1-2;s2-2;>         dice.m:66    8 (3)    3      0.27
+pred dice.msort_n/4-0    <e;e;>               dice.m:55    8 (3)    3      0.27
+pred dice.msort_n/4-0    CALL                 dice.m:37   19 (3)    7      0.27
+pred dice.msort_n/4-0    EXIT                 dice.m:37   19 (3)    7      0.27
+pred dice.msort_n/4-0    <?;>                 dice.m:39   19 (3)    7      0.27
+pred dice.msort_n/4-0    <e;?;>               dice.m:44   19 (3)    7      0.27
+pred dice.msort_n/4-0    <e;>                 dice.m:54   19 (3)    7      0.27
+pred dice.msort_n/4-0    <e;t;s2-2;>          dice.m:47   11 (3)    4      0.27
+pred dice.msort_n/4-0    <e;t;>               dice.m:50   11 (3)    4      0.27
+pred dice.main/2-0       CALL                 dice.m:17    3 (3)    1      0.25
+pred dice.main/2-0       EXIT                 dice.m:17    3 (3)    1      0.25
+pred dice.main/2-0       <c2;?;>              dice.m:20    3 (3)    1      0.25
+pred dice.main/2-0       <c2;t;>              dice.m:22    3 (3)    1      0.25
+pred dice.merge_sort/2-0 CALL                 dice.m:31    3 (3)    1      0.25
+pred dice.merge_sort/2-0 EXIT                 dice.m:31    3 (3)    1      0.25
+pred dice.merge/3-0      <s2-2;c2;s2-2;c4;t;> dice.m:71   10 (3)    3      0.23
+mdb> dice -sSF -m dice
+Procedure                Path/Port            File:Line Pass (3) Fail Suspicion
+pred dice.merge/3-0      <s2-2;c2;s2-2;c4;e;> dice.m:74    0 (0)    1      1.00
+pred dice.merge/3-0      <s2-2;>              dice.m:64   10 (3)    4      0.29
+pred dice.merge/3-0      <s2-2;c2;s2-2;>      dice.m:67   10 (3)    4      0.29
+pred dice.merge/3-0      <s2-2;c2;s2-2;c4;?;> dice.m:69   10 (3)    4      0.29
+pred dice.merge/3-0      CALL                 dice.m:64   18 (3)    7      0.28
+pred dice.merge/3-0      EXIT                 dice.m:64   18 (3)    7      0.28
+pred dice.merge/3-0      <s1-2;>              dice.m:64    8 (3)    3      0.27
+pred dice.merge/3-0      <s1-2;s2-2;>         dice.m:66    8 (3)    3      0.27
+pred dice.msort_n/4-0    <e;e;>               dice.m:55    8 (3)    3      0.27
+pred dice.msort_n/4-0    CALL                 dice.m:37   19 (3)    7      0.27
+pred dice.msort_n/4-0    EXIT                 dice.m:37   19 (3)    7      0.27
+pred dice.msort_n/4-0    <?;>                 dice.m:39   19 (3)    7      0.27
+pred dice.msort_n/4-0    <e;?;>               dice.m:44   19 (3)    7      0.27
+pred dice.msort_n/4-0    <e;>                 dice.m:54   19 (3)    7      0.27
+pred dice.msort_n/4-0    <e;t;s2-2;>          dice.m:47   11 (3)    4      0.27
+pred dice.msort_n/4-0    <e;t;>               dice.m:50   11 (3)    4      0.27
+pred dice.main/2-0       CALL                 dice.m:17    3 (3)    1      0.25
+pred dice.main/2-0       EXIT                 dice.m:17    3 (3)    1      0.25
+pred dice.main/2-0       <c2;?;>              dice.m:20    3 (3)    1      0.25
+pred dice.main/2-0       <c2;t;>              dice.m:22    3 (3)    1      0.25
+pred dice.merge_sort/2-0 CALL                 dice.m:31    3 (3)    1      0.25
+pred dice.merge_sort/2-0 EXIT                 dice.m:31    3 (3)    1      0.25
+pred dice.merge/3-0      <s2-2;c2;s2-2;c4;t;> dice.m:71   10 (3)    3      0.23
+mdb> dice -n 3 -s P -m dice
+Procedure             Path/Port File:Line Pass (3) Fail Suspicion
+pred dice.msort_n/4-0 CALL      dice.m:37   19 (3)    7      0.27
+pred dice.msort_n/4-0 EXIT      dice.m:37   19 (3)    7      0.27
+pred dice.msort_n/4-0 <?;>      dice.m:39   19 (3)    7      0.27
+mdb> dice -s Fp -m dice
+Procedure                Path/Port            File:Line Pass (3) Fail Suspicion
+pred dice.merge/3-0      CALL                 dice.m:64   18 (3)    7      0.28
+pred dice.merge/3-0      EXIT                 dice.m:64   18 (3)    7      0.28
+pred dice.msort_n/4-0    CALL                 dice.m:37   19 (3)    7      0.27
+pred dice.msort_n/4-0    EXIT                 dice.m:37   19 (3)    7      0.27
+pred dice.msort_n/4-0    <?;>                 dice.m:39   19 (3)    7      0.27
+pred dice.msort_n/4-0    <e;?;>               dice.m:44   19 (3)    7      0.27
+pred dice.msort_n/4-0    <e;>                 dice.m:54   19 (3)    7      0.27
+pred dice.merge/3-0      <s2-2;>              dice.m:64   10 (3)    4      0.29
+pred dice.merge/3-0      <s2-2;c2;s2-2;>      dice.m:67   10 (3)    4      0.29
+pred dice.merge/3-0      <s2-2;c2;s2-2;c4;?;> dice.m:69   10 (3)    4      0.29
+pred dice.msort_n/4-0    <e;t;s2-2;>          dice.m:47   11 (3)    4      0.27
+pred dice.msort_n/4-0    <e;t;>               dice.m:50   11 (3)    4      0.27
+pred dice.merge/3-0      <s1-2;>              dice.m:64    8 (3)    3      0.27
+pred dice.merge/3-0      <s1-2;s2-2;>         dice.m:66    8 (3)    3      0.27
+pred dice.msort_n/4-0    <e;e;>               dice.m:55    8 (3)    3      0.27
+pred dice.merge/3-0      <s2-2;c2;s2-2;c4;t;> dice.m:71   10 (3)    3      0.23
+pred dice.merge/3-0      <s2-2;c2;s2-2;c4;e;> dice.m:74    0 (0)    1      1.00
+pred dice.main/2-0       CALL                 dice.m:17    3 (3)    1      0.25
+pred dice.main/2-0       EXIT                 dice.m:17    3 (3)    1      0.25
+pred dice.main/2-0       <c2;?;>              dice.m:20    3 (3)    1      0.25
+pred dice.main/2-0       <c2;t;>              dice.m:22    3 (3)    1      0.25
+pred dice.merge_sort/2-0 CALL                 dice.m:31    3 (3)    1      0.25
+pred dice.merge_sort/2-0 EXIT                 dice.m:31    3 (3)    1      0.25
+mdb> dice -sS -n 1 --module dice
+Procedure           Path/Port            File:Line Pass (3) Fail Suspicion
+pred dice.merge/3-0 <s2-2;c2;s2-2;c4;e;> dice.m:74    0 (0)    1      1.00
+mdb> break dice.m:74
+ 0: + stop  linenumber dice.m:74
+mdb> c
+      E2:     C2 ELSE pred dice.merge/3-0 (det) s2-2;c2;s2-2;c4;e;
+mdb> quit -y
cvs diff: Diffing tests/debugger/declarative
cvs diff: Diffing tests/dppd
cvs diff: Diffing tests/general
cvs diff: Diffing tests/general/accumulator
cvs diff: Diffing tests/general/string_format
cvs diff: Diffing tests/general/structure_reuse
cvs diff: Diffing tests/grade_subdirs
cvs diff: Diffing tests/hard_coded
cvs diff: Diffing tests/hard_coded/exceptions
cvs diff: Diffing tests/hard_coded/purity
cvs diff: Diffing tests/hard_coded/sub-modules
cvs diff: Diffing tests/hard_coded/typeclasses
cvs diff: Diffing tests/invalid
cvs diff: Diffing tests/invalid/purity
cvs diff: Diffing tests/misc_tests
cvs diff: Diffing tests/mmc_make
cvs diff: Diffing tests/mmc_make/lib
cvs diff: Diffing tests/par_conj
cvs diff: Diffing tests/recompilation
cvs diff: Diffing tests/stm
cvs diff: Diffing tests/stm/orig
cvs diff: Diffing tests/stm/orig/stm-compiler
cvs diff: Diffing tests/stm/orig/stm-compiler/test1
cvs diff: Diffing tests/stm/orig/stm-compiler/test10
cvs diff: Diffing tests/stm/orig/stm-compiler/test2
cvs diff: Diffing tests/stm/orig/stm-compiler/test3
cvs diff: Diffing tests/stm/orig/stm-compiler/test4
cvs diff: Diffing tests/stm/orig/stm-compiler/test5
cvs diff: Diffing tests/stm/orig/stm-compiler/test6
cvs diff: Diffing tests/stm/orig/stm-compiler/test7
cvs diff: Diffing tests/stm/orig/stm-compiler/test8
cvs diff: Diffing tests/stm/orig/stm-compiler/test9
cvs diff: Diffing tests/stm/orig/stm-compiler-par
cvs diff: Diffing tests/stm/orig/stm-compiler-par/bm1
cvs diff: Diffing tests/stm/orig/stm-compiler-par/bm2
cvs diff: Diffing tests/stm/orig/stm-compiler-par/stmqueue
cvs diff: Diffing tests/stm/orig/stm-compiler-par/test1
cvs diff: Diffing tests/stm/orig/stm-compiler-par/test10
cvs diff: Diffing tests/stm/orig/stm-compiler-par/test11
cvs diff: Diffing tests/stm/orig/stm-compiler-par/test2
cvs diff: Diffing tests/stm/orig/stm-compiler-par/test3
cvs diff: Diffing tests/stm/orig/stm-compiler-par/test4
cvs diff: Diffing tests/stm/orig/stm-compiler-par/test5
cvs diff: Diffing tests/stm/orig/stm-compiler-par/test6
cvs diff: Diffing tests/stm/orig/stm-compiler-par/test7
cvs diff: Diffing tests/stm/orig/stm-compiler-par/test8
cvs diff: Diffing tests/stm/orig/stm-compiler-par/test9
cvs diff: Diffing tests/stm/orig/stm-compiler-par-asm_fast
cvs diff: Diffing tests/stm/orig/stm-compiler-par-asm_fast/test1
cvs diff: Diffing tests/stm/orig/stm-compiler-par-asm_fast/test2
cvs diff: Diffing tests/stm/orig/stm-compiler-par-asm_fast/test3
cvs diff: Diffing tests/stm/orig/stm-compiler-par-asm_fast/test4
cvs diff: Diffing tests/stm/orig/stm-compiler-par-asm_fast/test5
cvs diff: Diffing tests/stm/orig/stm-compiler-par-asm_fast/test6
cvs diff: Diffing tests/stm/orig/stm-compiler-par-asm_fast/test7
cvs diff: Diffing tests/stm/orig/stm-compiler-par-asm_fast/test8
cvs diff: Diffing tests/stm/orig/stm-compiler-par-asm_fast/test9
cvs diff: Diffing tests/tabling
Index: tests/tabling/Mmakefile
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/tabling/Mmakefile,v
retrieving revision 1.55
diff -u -b -r1.55 Mmakefile
--- tests/tabling/Mmakefile	1 Dec 2008 00:32:57 -0000	1.55
+++ tests/tabling/Mmakefile	20 Jul 2009 03:17:38 -0000
@@ -245,7 +245,9 @@
 		sed     -e 's/(100.00\%)/(NNN\%)/' \
 			-e 's/ ([1-9][0-9]\.[0-9][0-9]\%)/(NNN\%)/' \
 			-e 's/  ([0-9]\.[0-9][0-9]\%)/(NNN\%)/' \
-			-e 's/[1-9][0-9],[0-9][0-9][0-9]/   NNN/' \
+			-e 's/[1-9],[0-9][0-9][0-9],[0-9][0-9][0-9]/      NNN/' \
+			-e 's/  [1-9][0-9][0-9],[0-9][0-9][0-9]/      NNN/' \
+			-e 's/   [1-9][0-9],[0-9][0-9][0-9]/      NNN/' \
 			-e 's/ [1-9],[0-9][0-9][0-9]/   NNN/' \
 			-e 's/   [1-9][0-9][0-9]/   NNN/' \
 			-e 's/    [1-9][0-9]/   NNN/' \
Index: tests/tabling/fib_stats.exp2
===================================================================
RCS file: tests/tabling/fib_stats.exp2
diff -N tests/tabling/fib_stats.exp2
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/tabling/fib_stats.exp2	20 Jul 2009 03:22:31 -0000
@@ -0,0 +1,115 @@
+fib(1): 1
+fib(2): 2
+fib(3): 3
+fib(4): 5
+fib(5): 8
+fib(6): 13
+fib(7): 21
+fib(8): 34
+fib(9): 55
+fib(10): 89
+
+Previous call table for mfib, test 1 to 10:
+number of lookups:                                    0
+
+Current call table for mfib, test 1 to 10:
+number of lookups:                                   28
+number of successful lookups (old calls):            17  (60.71%)
+number of unsuccessful lookups (new calls):          11  (39.29%)
+statistics for the individual steps:
+
+step 1, variable N: hash table
+  number of lookups:                                 28
+  number of successful lookups:                      17  (60.71%)
+  number of unsuccessful lookups:                    11  (39.29%)
+  number of hash table allocations:                   1
+  number of bytes allocated for hash tables:      1,072
+  number of bulk hash link allocations:               1
+  number of bytes allocated for hash links:       6,160
+  number of key compares when unsuccessful:           0
+  number of key compares when successful:            17
+  number of hash table resizes:                       0
+
+Call table difference (curr - prev) for mfib, test 1 to 10:
+number of lookups:                                   28
+number of successful lookups (old calls):            17  (60.71%)
+number of unsuccessful lookups (new calls):          11  (39.29%)
+statistics for the individual steps:
+
+step 1, variable N: hash table
+  number of lookups:                                 28
+  number of successful lookups:                      17  (60.71%)
+  number of unsuccessful lookups:                    11  (39.29%)
+  number of hash table allocations:                   1
+  number of bytes allocated for hash tables:      1,072
+  number of bulk hash link allocations:               1
+  number of bytes allocated for hash links:       6,160
+  number of key compares when unsuccessful:           0
+  number of key compares when successful:            17
+  number of hash table resizes:                       0
+
+fib(11): 144
+fib(12): 233
+fib(13): 377
+fib(14): 610
+fib(15): 987
+fib(16): 1597
+fib(17): 2584
+fib(18): 4181
+fib(19): 6765
+fib(20): 10946
+
+Previous call table for mfib, test 11 to 20:
+number of lookups:                                   28
+number of successful lookups (old calls):            17  (60.71%)
+number of unsuccessful lookups (new calls):          11  (39.29%)
+statistics for the individual steps:
+
+step 1, variable N: hash table
+  number of lookups:                                 28
+  number of successful lookups:                      17  (60.71%)
+  number of unsuccessful lookups:                    11  (39.29%)
+  number of hash table allocations:                   1
+  number of bytes allocated for hash tables:      1,072
+  number of bulk hash link allocations:               1
+  number of bytes allocated for hash links:       6,160
+  number of key compares when unsuccessful:           0
+  number of key compares when successful:            17
+  number of hash table resizes:                       0
+
+Current call table for mfib, test 11 to 20:
+number of lookups:                                   58
+number of successful lookups (old calls):            37  (63.79%)
+number of unsuccessful lookups (new calls):          21  (36.21%)
+statistics for the individual steps:
+
+step 1, variable N: hash table
+  number of lookups:                                 58
+  number of successful lookups:                      37  (63.79%)
+  number of unsuccessful lookups:                    21  (36.21%)
+  number of hash table allocations:                   1
+  number of bytes allocated for hash tables:      1,072
+  number of bulk hash link allocations:               1
+  number of bytes allocated for hash links:       6,160
+  number of key compares when unsuccessful:           0
+  number of key compares when successful:            37
+  number of hash table resizes:                       0
+
+Call table difference (curr - prev) for mfib, test 11 to 20:
+number of lookups:                                   30
+number of successful lookups (old calls):            20  (66.67%)
+number of unsuccessful lookups (new calls):          10  (33.33%)
+statistics for the individual steps:
+
+step 1, variable N: hash table
+  number of lookups:                                 30
+  number of successful lookups:                      20  (66.67%)
+  number of unsuccessful lookups:                    10  (33.33%)
+  number of hash table allocations:                   0
+  number of bytes allocated for hash tables:          0
+  number of bulk hash link allocations:               0
+  number of bytes allocated for hash links:           0
+  number of key compares when unsuccessful:           0
+  number of key compares when successful:            20
+  number of hash table resizes:                       0
+
Index: tests/tabling/specified_stats.exp
===================================================================
RCS file: /home/mercury/mercury1/repository/tests/tabling/specified_stats.exp,v
retrieving revision 1.2
diff -u -b -r1.2 specified_stats.exp
--- tests/tabling/specified_stats.exp	9 Jun 2008 04:29:12 -0000	1.2
+++ tests/tabling/specified_stats.exp	20 Jul 2009 03:31:17 -0000
@@ -139,7 +139,7 @@
   number of hash table allocations:                 NNN
   number of bytes allocated for hash tables:        NNN
   number of bulk hash link allocations:             NNN
-  number of bytes allocated for hash links:   NNN   NNN
+  number of bytes allocated for hash links:         NNN
   number of key compares when unsuccessful:         NNN
   number of key compares when successful:           NNN
   number of hash table resizes:                     NNN
@@ -152,9 +152,9 @@
   number of bytes allocated for du functors:        NNN
   number of du functor argument lookups:            NNN
   number of hash table allocations:                 NNN
-  number of bytes allocated for hash tables:    6   NNN
+  number of bytes allocated for hash tables:        NNN
   number of bulk hash link allocations:             NNN
-  number of bytes allocated for hash links:   3,7   NNN
+  number of bytes allocated for hash links:         NNN
   number of key compares when unsuccessful:         NNN
   number of key compares when successful:           NNN
   number of hash table resizes:                     NNN
@@ -176,7 +176,7 @@
   number of hash table allocations:                 NNN
   number of bytes allocated for hash tables:        NNN
   number of bulk hash link allocations:             NNN
-  number of bytes allocated for hash links:   NNN   NNN
+  number of bytes allocated for hash links:         NNN
   number of key compares when unsuccessful:         NNN
   number of key compares when successful:           NNN
   number of hash table resizes:                     NNN
cvs diff: Diffing tests/term
cvs diff: Diffing tests/trailing
cvs diff: Diffing tests/valid
cvs diff: Diffing tests/warnings
cvs diff: Diffing tools
cvs diff: Diffing trace
cvs diff: Diffing util
cvs diff: Diffing vim
cvs diff: Diffing vim/after
cvs diff: Diffing vim/ftplugin
cvs diff: Diffing vim/syntax
--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------



More information about the reviews mailing list