[llvm-commits] CVS: nightlytest-serverside/NightlyTestAccept.php

[Jim Laskey]

Changes in directory nightlytest-serverside:

NightlyTestAccept.php updated: 1.51 -> 1.52
---
Log message:

Fix problems with significantly changed report

---
Diffs of the changes:  (+17 -8)

 NightlyTestAccept.php |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)


Index: nightlytest-serverside/NightlyTestAccept.php
diff -u nightlytest-serverside/NightlyTestAccept.php:1.51 nightlytest-serverside/NightlyTestAccept.php:1.52
--- nightlytest-serverside/NightlyTestAccept.php:1.51	Tue Sep 19 11:51:12 2006
+++ nightlytest-serverside/NightlyTestAccept.php	Tue Sep 19 14:12:33 2006
@@ -823,6 +823,7 @@
   print "Gathered all previous night\'s programs\n";
 }
 
+$monitoring = array("Bytecode", "CBE", "GCCAS", "JIT", "LLC", "LLC-BETA", "LLC compile", "LLC-BETA compile");
 $output_big_changes = array();
 foreach ($prog_hash_new as $prog => $prog_new) {
   $prog_old = $prog_hash_old[$prog];
@@ -832,18 +833,26 @@
   $vals_old = split(",", $prog_old);
   
   // get list of values measured from newest test
-  $measures = array();
+  $new_measures = array();
   foreach ($vals_new as $measure) {
-    $measure = preg_replace("/[ \,\.\:\-0-9]*/", "", $measure);
-    if(strpos($measure, "/") == 0) {
-      array_push($measures, $measure);
-    }
+    list($measure, $value) = split(": ", $measure);
+    $new_measures[$measure] = $value;
   }
   
+  // get list of values measured from older test
+  $old_measures = array();
+  foreach ($vals_old as $measure) {
+    list($measure, $value) = split(": ", $measure);
+    $old_measures[$measure] = $value;
+  }
+
   // put measures into hash of arrays
-  foreach ($measures as $measure) {
-    $value_new = MatchOne("/$measure:.*?(\d*\.*\d+)/", $prog_new, "0");
-    $value_old = MatchOne("/$measure:.*?(\d*\.*\d+)/", $prog_old, "0");
+  foreach ($monitoring as $measure) {
+    $value_new = MatchOne("/(\d+\.?\d*)/", $new_measures[$measure], "");
+    $value_old = MatchOne("/(\d+\.?\d*)/", $old_measures[$measure], "");
+    
+    if (StringIsNull($value_new) || StringIsNull($value_old)) continue;
+    
     $diff = ($value_old - $value_new);
     $perc = 0;