Disabled radiosity test because it seems to hang when p >= 2. Updated results.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8262

diff --git a/exp-drd/scripts/run-splash2 b/exp-drd/scripts/run-splash2
index a8eeb62f68c50fa329886dd2bb0a6f63ee8c905c..36e2402e97a04c90727cb0485597983962f76c81 100755 (executable)
--- a/exp-drd/scripts/run-splash2
+++ b/exp-drd/scripts/run-splash2
@@ -109,17 +109,17 @@ fi
 # Results:                native       native       native       none     none       DRD       DRD      HG        ITC ITC
 #                         -p1          -p2          -p4          -p1      -p4       -p4      -p4+f     -p4      -p4 -p4+f
 # .......................................................................................................................
-# Cholesky                0.36  45867  0.25  55965  0.20  74944  8.9 2.08 18.5 1.66 171 1.96 123 2.07   52  3.09 239   82
-# FFT                     0.23   6 GB  0.14   6 GB  0.10   6 GB  7.3 1.01 14.9 1.00 111 1.01  74 1.01 2201  1.76  90   41
-# LU, contiguous          0.95  16784  0.64  24984  0.43  41392  8.0 3.88 18.5 2.17 117 2.84 111 3.04  219  4.36 428  128
-# LU, non-contiguous      1.11  16792  0.69  24984  0.41  41376  7.2 3.88 19.2 2.17 197 3.04 176 3.24  158  4.26 428  128
-# Ocean, contiguous      24.53 918016 13.97 927732  9.28 945664  2.4 1.05  6.5 1.05  87 1.90  75 1.92  145  1.88  90   28
-# Ocean, non-contiguous   0.36  32120  0.19  40320  0.17  56728  4.2 2.51  9.8 1.86  55 2.27  67 2.43  119  3.54  90   28
-# Radiosity               4.73  56120  4.71  56120  4.71  56120 16.6 1.86 16.6 1.86 116 7.68  50 7.39   56  5.04 485  163
-# Radix                   4.98 279744  2.55 287936  1.36 304448  6.1 1.17 21.3 1.16  54 1.90  50 1.92  212  2.09 222   56
-# Raytrace                2.77 320526  2.77 320526  2.77 320526  7.6 1.15  7.6 1.15 202 1.26  53 1.26   87  2.09 172   53
-# Water-n2                0.19  17304  0.19  17304  0.19  17304 12.3 3.85 12.3 3.85  66 5.13  34 5.13   45  7.68 189   39
-# Water-sp                0.20  10976  0.21  10976  0.21  10976 11.5 5.41 10.9 5.41  72 5.85  33 5.85   43 10.90 183   34
+# Cholesky                0.37  45867  0.25  55965  0.20  74944  8.6 2.08 20.0 1.29  169 1.52 113 1.61   55  2.41 239  82
+# FFT                     0.20  23976  0.13  54026  0.09 114112  8.2 3.02 18.4 0.85  130 1.20  85 1.27  416  1.65  90  41
+# LU, contiguous          0.95  16784  0.64  24984  0.43  41392  8.0 3.88 19.3 2.17  120 2.84 113 3.04  223  4.36 428 128
+# LU, non-contiguous      1.06  16792  0.67  24984  0.40  41376  7.5 3.88 20.0 2.17  210 3.04 190 3.24  166  4.26 428 128
+# Ocean, contiguous      24.25 918016 14.57 927732  9.09 945664  2.4 1.05  6.6 1.05   89 1.92  77 1.93  149  1.88  90  28
+# Ocean, non-contiguous   0.36  32120  0.18  40320  0.16  56728  4.2 2.51 10.4 1.86   58 2.27  71 2.43  127  3.54  90  28
+# Radiosity               4.73  56120  ....  .....  ....  ..... 16.6 1.86 .... ....  ... ....  .. ....   ..  .... 485 163
+# Radix                   4.98 279744  2.55 287936  1.36 304448  6.1 1.17 22.4 1.16   57 1.90  52 1.92  208  2.09 222  56
+# Raytrace                2.77 320526  .... ......  .... ......  7.6 1.15  ... ....  ... ....  .. ....   ..  .... 172  53
+# Water-n2                0.19  17304  0.12  33680  0.12  66432 12.0 3.85 20.2 3.53 2789 2.78 562 2.84  121  3.32 189  39
+# Water-sp                0.21  10976  0.11  19176  0.07  35568 11.0 5.41 33.3 2.37  475 2.85 147 3.08  196  4.61 183  34
 # .......................................................................................................................
 # Hardware: Two quad-core Intel Xeon L5130, 1.6 GHz, 4 MB L2 cache, 16 GB RAM.
 # Software: Ubuntu 8.04 server, 64-bit, gcc 4.3.1.
@@ -127,17 +127,17 @@ fi
 # Results:                native       native       native       none     none       DRD       DRD      HG        ITC ITC
 #                         -p1          -p2          -p4          -p1      -p4       -p4      -p4+f     -p4      -p4 -p4+f
 # .......................................................................................................................
-# Cholesky                0.29  45835  0.21  55933  4.70  96789  9.5 2.21  0.9 1.35    6 1.59   4 1.67    2  2.51 239  82
-# FFT                     0.19   6 GB  0.12   6 GB  0.12   6 GB  7.2 1.01 11.1 1.01   82 1.02  55 1.02 ....  ....  90  41
-# LU, contiguous          0.81  16752  0.54  24957  0.52  41365  7.6 4.27 12.2 2.33   80 3.00  76 3.20  149  4.51 428 128
-# LU, non-contiguous      0.86  16760  0.47  24957  0.49  41352  6.9 4.26 12.4 2.33  138 3.20 127 3.40  108  4.42 428 128
-# Ocean, contiguous      19.46 918016 12.59 927232 12.61 945664  2.4 1.06  6.5 1.06   53 1.92**47 1.93   86  1.88  90  28
-# Ocean, non-contiguous   0.30  32088  0.19  40293  0.19  56696  4.0 2.71  6.8 1.97   38 2.43  47 2.57   84  3.66  90  28
-# Radiosity               3.84  56088  3.84  56088  3.84  56088 16.3 1.98 16.4 1.98  112 7.80  49 7.51   55  5.16 485 163
-# Radix                   4.07 279680  2.12 287872  2.12 304427  6.0 1.20 11.5 1.18   29 1.92  27 1.94  141  2.12 222  56
-# Raytrace                2.22 320192  2.19 ......  2.20 ......  7.4 1.17  7.4 1.17  165 1.28  54 1.28   92  2.11 172  53
-# Water-n2                0.15  17272  0.10  33656  0.12  66432 12.4 4.22 16.1 1.84  ... ....  .. ....   ..  .... 189  39
-# Water-sp                0.18  10947  ....  .....  ....  ..... 10.4 0.58 11.1 6.00  ... ....  .. ....   ..  .... 183  34
+# Cholesky                0.29  45835  0.21  55933  4.51  74944  8.8 2.21  1.0 1.75    6 2.05   4 2.16    2  3.22 239  82
+# FFT                     0.17  23949  0.12  32144  0.11  48536  7.8 3.28 12.0 2.13   85 2.96  56 3.13  282  4.02  90  41
+# LU, contiguous          0.78  16752  0.53  24957  0.53  41365  7.9 4.27 11.7 2.33   78 3.00  74 3.20  146  4.51 428 128
+# LU, non-contiguous      0.86  16760  0.47  24957  0.50  41352  7.0 4.26 12.2 2.33  135 3.20 125 3.40  107  4.41 428 128
+# Ocean, contiguous      19.47 918016 12.59 927232 12.61 945664  2.4 1.06  3.8 1.06   53 1.92  47 1.93   86  1.88  90  28
+# Ocean, non-contiguous   0.31  32088  0.17  40291  0.19  56696  3.9 2.71  6.8 1.97   38 2.38  47 2.55   84  3.66  90  28
+# Radiosity               3.85  56088  ....  .....  ....  ..... 16.4 1.98 .... ....  ... ....  .. ....   ..  .... 485 163
+# Radix                   4.05 279680  2.12 287872  2.14 304405  6.0 1.20 11.4 1.18   29 1.92  27 1.94  157  2.12 222  56
+# Raytrace                2.22 320192  ....  .....  2.20 ......  7.4 1.17  ... ....  ... ....  .. ....   ..  .... 172  53
+# Water-n2                0.15  17272  0.10  33651  0.11  66432 12.3 4.22 17.5 1.84 2320 2.90 583 2.92  105  3.41 189  39
+# Water-sp                0.16  10947  0.09  19144  0.09  35536 11.4 6.00 20.7 2.55  251 3.03  91 3.26  123  4.79 183  34
 # .......................................................................................................................
 # Hardware: dual-core Intel Xeon 5130, 2.0 GHz, 4 MB L2 cache, 4 GB RAM.
 # Software: Ubuntu 7.10 server, 64-bit, gcc 4.3.1, xload -update 1 running.
@@ -188,7 +188,9 @@ run_test ${SPLASH2}/codes/apps/ocean/contiguous_partitions/OCEAN -n2050
 run_test ${SPLASH2}/codes/apps/ocean/non_contiguous_partitions/OCEAN -n258
 
 # Radiosity.
-run_test ${SPLASH2}/codes/apps/radiosity/RADIOSITY -batch -room
+if false; then
+psep=' ' run_test ${SPLASH2}/codes/apps/radiosity/RADIOSITY -batch -room
+fi
 
 # Radix
 run_test ${SPLASH2}/codes/kernels/radix/RADIX -n $((2**24))