Update with scripts from i44pc15 master
authorJoachim Breitner <breitner@kit.edu>
Sat, 25 Oct 2014 09:37:49 +0000 (11:37 +0200)
committerJoachim Breitner <breitner@kit.edu>
Sat, 25 Oct 2014 09:38:47 +0000 (11:38 +0200)
ci-validate.sh
compare-ifaces.sh
compare-testruns.sh
new-ghc-checkout
run-nofib.sh [new file with mode: 0755]

index 4221c73..c1e58fb 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-cd /5playpen/t-jobrei/ghc-validate
+cd /data1/breitner/ghc/ghc-validate
 
 function get_branch () 
 {
@@ -36,6 +36,9 @@ LOGFILE="../validate-$BRANCH_BASE-$(date --iso=minutes).log"
 
 echo "I am asked to validate $BRANCH_BASE"
 
+echo "Cleaning up future branch names"
+run_quiet ./sync-all --ignore-failure branch -D "validating/$BRANCH_BASE" "validated/$BRANCH_BASE" "broken/$BRANCH_BASE"
+
 echo "Making sure we are on current master"
 run_quiet ./sync-all checkout master
 run_quiet ./sync-all pull
@@ -43,18 +46,18 @@ echo "Switching to that branch"
 run_quiet ./sync-all checkout "$BRANCH"
 git branch | fgrep -q "* $BRANCH"
 echo "moving branch to validating/$BRANCH_BASE"
-run_quiet ./sync-all --ignore-failure branch -M "$BRANCH" "validating/$BRANCH_BASE"
+run_quiet ./sync-all --ignore-failure branch -m "$BRANCH" "validating/$BRANCH_BASE"
 echo "Running validate"
 export CPUS=8
 if run_to "$LOGFILE" ./validate --no-dph 
 then
        echo "validate successful"
        echo "moving branch to validated/$BRANCH_BASE"
-       run_quiet ./sync-all --ignore-failure branch -M "validating/$BRANCH_BASE" "validated/$BRANCH_BASE"
+       run_quiet ./sync-all --ignore-failure branch -m "validating/$BRANCH_BASE" "validated/$BRANCH_BASE"
 else
        echo "validate broken"
        echo "moving branch to broken/$BRANCH_BASE"
-       run_quiet ./sync-all --ignore-failure branch -M "validating/$BRANCH_BASE" "broken/$BRANCH_BASE"
+       run_quiet ./sync-all --ignore-failure branch -m "validating/$BRANCH_BASE" "broken/$BRANCH_BASE"
 fi
 run_quiet make -C testsuite CLEANUP=1 CLEAN_ONLY=YES
 run_quiet make clean
index dc1777e..710751f 100755 (executable)
@@ -26,7 +26,7 @@ then
 fi
 
 
-diff -U 10000 \
+${DIFF:-diff -U 10000} \
  <($tree1/inplace/bin/ghc-stage1 --show-iface $path1) \
  <($tree2/inplace/bin/ghc-stage1 --show-iface $path2)
 
index 8d6d030..ce48c60 100755 (executable)
@@ -11,8 +11,8 @@ then
   exit 1
 fi
 
-path1="$( find $tree1 -path \*/$benchname -type d )"
-path2="$( find $tree2 -path \*/$benchname -type d )"
+path1="$( find $tree1/nofib -path \*/$benchname -type d )"
+path2="$( find $tree2/nofib -path \*/$benchname -type d )"
 
 if [ -z "$path1" ]
 then
@@ -22,7 +22,7 @@ fi
 echo "Found $path1 in $tree1"
 if [ -z "$path2" ]
 then
-  echo "Could not find a directory $benchname in $path2"
+  echo "Could not find a directory $benchname in $tree2"
   exit 1
 fi
 echo "Found $path2 in $tree2"
index 4da17e6..4554800 100755 (executable)
@@ -7,10 +7,10 @@ then
 fi
 
 set -e
-cd /5playpen/t-jobrei/
+cd /data1/breitner/ghc
 git clone ghc-master "$1"
 cd "$1"
-./sync-all --no-dph --testsuite get
+./sync-all --no-dph --nofib get
 ./sync-all -r git://git.haskell.org remote set-url origin
 ./sync-all -r ssh://git@git.haskell.org remote set-url --push origin
 ./sync-all checkout master
diff --git a/run-nofib.sh b/run-nofib.sh
new file mode 100755 (executable)
index 0000000..cb180d5
--- /dev/null
@@ -0,0 +1,30 @@
+test -d nofib || { echo "No nofib found" ; exit 1 ;  }
+
+set -e
+
+if [ "$1" = "slow" ]
+then
+  mode=slow
+  variant="-slow"
+  shift
+else
+  mode=norm
+  variant=""
+fi
+
+git fetch origin
+
+name="$(date --iso=minutes)-$(cd ..; git rev-parse HEAD|cut -c-8)"
+
+if [ "$1" != noclean ]
+then
+       make distclean
+       perl boot
+       ./configure 
+fi
+/usr/bin/time -o buildtime-$name make -j8
+cd nofib/
+make clean
+make boot
+(cd ..; git log origin/master..HEAD; cd nofib; make mode=$mode) 2>&1 |
+       tee ../nofib-$name$variant.log