New LLVM merging bots

tools/llvm/utman.sh

 #!/bin/bash
 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 #@                 Untrusted Toolchain Manager
 #@-------------------------------------------------------------------
 #@ This script builds the ARM and PNaCl untrusted toolchains.
 #@ It MUST be run from the native_client/ directory.
 #
@@ skipping 23 matching lines @@
   echo "ERROR: cannot find native_client/ directory"
   exit -1
 fi
 readonly NACL_ROOT="$(pwd)"
 
 source tools/llvm/common-tools.sh
 
 SetScriptPath "${NACL_ROOT}/tools/llvm/utman.sh"
 SetLogDirectory "${NACL_ROOT}/toolchain/hg-log"
 
+# Use upstream merging repository
+readonly UTMAN_UPSTREAM=${UTMAN_UPSTREAM:-false}
+readonly UTMAN_UPSTREAM_SKIP_UPDATE=${UTMAN_UPSTREAM_SKIP_UPDATE:-false}
+if ${UTMAN_UPSTREAM}; then
+  UTMAN_USE_MQ=false
+fi
+
 # Set to false to go back to compiling with the old pnacl-sfi branch
 readonly UTMAN_USE_MQ=${UTMAN_USE_MQ:-true}
 readonly UTMAN_RESET_MQ=${UTMAN_RESET_MQ:-true}
 
 # Ignore this variable. Its for helping jasonwkim merge
 # So a unique identifier for the branch in the MQ is composed of
 # (a) LLVM svn rev  (looks like svnXXXXXX)
 # (b) NaCl rev (looks like naclYYYY)
 # (c) Any other unique human readable mnemonic that one cares to use to \
 #     identify the branch.
@@ skipping 67 matching lines @@
 # Leave this blank, it will be filled during processing.
 SPECULATIVE_REBUILD_SET=""
 
 # The directory in which we we keep src dirs (from hg repos)
 # and objdirs. These should be ABSOLUTE paths.
 
 readonly TC_SRC="${NACL_ROOT}/hg"
 readonly TC_BUILD="${TC_ROOT}/hg-build-${LIBMODE}"
 
 # The location of sources (absolute)
-readonly TC_SRC_LLVM="${TC_SRC}/llvm/llvm-trunk"
-readonly TC_SRC_LLVM_GCC="${TC_SRC}/llvm-gcc/llvm-gcc-4.2"
+
+if ${UTMAN_UPSTREAM}; then
+  readonly TC_SRC_UPSTREAM="${TC_SRC}/upstream"
+  readonly TC_SRC_LLVM="${TC_SRC_UPSTREAM}/llvm"
+  readonly TC_SRC_LLVM_GCC="${TC_SRC_UPSTREAM}/llvm-gcc"
+else
+  readonly TC_SRC_LLVM="${TC_SRC}/llvm/llvm-trunk"
+  readonly TC_SRC_LLVM_GCC="${TC_SRC}/llvm-gcc/llvm-gcc-4.2"
+fi
 readonly TC_SRC_BINUTILS="${TC_SRC}/binutils"
 readonly TC_SRC_NEWLIB="${TC_SRC}/newlib"
 readonly TC_SRC_COMPILER_RT="${TC_SRC}/compiler-rt"
 readonly TC_SRC_LIBSTDCPP="${TC_SRC_LLVM_GCC}/libstdc++-v3"
 readonly TC_SRC_GOOGLE_PERFTOOLS="${TC_SRC}/google-perftools"
 readonly TC_SRC_LLVM_MQ_PATCHES="${TC_SRC}/llvm-mq-patches"
 readonly TC_SRC_LLVM_GCC_MQ_PATCHES="${TC_SRC}/llvm-gcc-mq-patches"
 
 
 # Unfortunately, binutils/configure generates this untracked file
@@ skipping 76 matching lines @@
 
 # Which toolchain to use for each arch.
 if ${LIBMODE_NEWLIB}; then
   SBTC_BUILD_WITH_PNACL="arm x8632 x8664"
 else
   SBTC_BUILD_WITH_PNACL="x8632 x8664"
 fi
 
 # Current milestones in each repo
 # hg-update-pnacl-sfi uses these
-readonly LLVM_REV=9ca0d1b53734
-readonly LLVM_GCC_REV=e093fe8c5603
+if ${UTMAN_UPSTREAM}; then
+  readonly UPSTREAM_REV=pnacl-sfi # Update to head of pnacl-sfi
+else
+  readonly LLVM_REV=9ca0d1b53734
+  readonly LLVM_GCC_REV=e093fe8c5603
+fi
 # hg-update-non-llvm uses these
 readonly NEWLIB_REV=57d709868c78
 readonly BINUTILS_REV=14dd509248e5
 readonly COMPILER_RT_REV=1a3a6ffb31ea
 readonly GOOGLE_PERFTOOLS_REV=ad820959663d
 
 # Update these revs when you want to experiment with rebasing to a newer
 # version of llvm and llvm-gcc
 # Mercurial Queues Repos for Merges
 # todo(jasonwkim): figure out why hg tag can not be pushed!
-readonly LLVM_MQ_REV=${LLVM_MQ_REV:-"0d9c0424d854"}
-readonly LLVM_GCC_MQ_REV=${LLVM_GCC_MQ_REV:-"6951bd89b2e5"}
+if ${UTMAN_USE_MQ}; then
+  readonly LLVM_MQ_REV=${LLVM_MQ_REV:-"0d9c0424d854"}
+  readonly LLVM_GCC_MQ_REV=${LLVM_GCC_MQ_REV:-"6951bd89b2e5"}
 
-# Vendor Revs of llvm and llvm-gcc to which the qeues apply
-# svn128002
-readonly LLVM_QPARENT_REV=${LLVM_QPARENT_REV:-"1dd4ed44a6f8"}
-# svn126872
-readonly LLVM_GCC_QPARENT_REV=${LLVM_GCC_QPARENT_REV:-"3cde3ed75a27"}
+  # Vendor Revs of llvm and llvm-gcc to which the qeues apply
+  # svn128002
+  readonly LLVM_QPARENT_REV=${LLVM_QPARENT_REV:-"1dd4ed44a6f8"}
+  # svn126872
+  readonly LLVM_GCC_QPARENT_REV=${LLVM_GCC_QPARENT_REV:-"3cde3ed75a27"}
+fi
 
 
 # Repositories
-readonly REPO_LLVM_GCC="nacl-llvm-branches.llvm-gcc-trunk"
-readonly REPO_LLVM="nacl-llvm-branches.llvm-trunk"
+if ${UTMAN_UPSTREAM}; then
+  readonly REPO_UPSTREAM="nacl-llvm-branches.upstream"
+else
+  readonly REPO_LLVM_GCC="nacl-llvm-branches.llvm-gcc-trunk"
+  readonly REPO_LLVM="nacl-llvm-branches.llvm-trunk"
+fi
+
 readonly REPO_NEWLIB="nacl-llvm-branches.newlib"
 readonly REPO_BINUTILS="nacl-llvm-branches.binutils"
 readonly REPO_COMPILER_RT="nacl-llvm-branches.compiler-rt"
 readonly REPO_GOOGLE_PERFTOOLS="nacl-llvm-branches.google-perftools"
-readonly REPO_LLVM_MQ_PATCHES="nacl-llvm-branches.llvm-mq-patches"
-readonly REPO_LLVM_GCC_MQ_PATCHES="nacl-llvm-branches.llvm-gcc-mq-patches"
+
+if ${UTMAN_USE_MQ}; then
+  readonly REPO_LLVM_MQ_PATCHES="nacl-llvm-branches.llvm-mq-patches"
+  readonly REPO_LLVM_GCC_MQ_PATCHES="nacl-llvm-branches.llvm-gcc-mq-patches"
+fi
 
 
 # TODO(espindola): This should be ${CXX:-}, but llvm-gcc's configure has a
 # bug that brakes the build if we do that.
 CC=${CC:-gcc}
 CXX=${CXX:-g++}
 if ${HOST_ARCH_X8632} ; then
   # These are simple compiler wrappers to force 32bit builds
   # For bots and releases we build the toolchains
   # on the oldest system we care to support. Currently
@@ skipping 92 matching lines @@
   hg-update-llvm
 }
 
 #@ hg-update-non-llvm  - Update all repos to the latest stable rev,
 # other than LLVM and LLVM-GCC (they are handled separately via MQ)
 hg-update-non-llvm() {
   hg-update-newlib
   hg-update-binutils
   hg-update-compiler-rt
   hg-update-google-perftools
-  hg-update-llvm-mq-patches
-  hg-update-llvm-gcc-mq-patches
+  if ${UTMAN_USE_MQ}; then
+    hg-update-llvm-mq-patches
+    hg-update-llvm-gcc-mq-patches
+  fi
 }
 
 hg-assert-safe-to-update() {
   local name="$1"
   local dir="$2"
   local rev="$3"
 
   if ! hg-on-branch "${dir}" pnacl-sfi ; then
     Banner "hg/${name} is not on branch pnacl-sfi"
     exit -1
@@ skipping 104 matching lines @@
   hg-check-if-using-old-repo "${TC_SRC_LLVM_GCC}"
   hg-update-common "llvm-gcc" ${LLVM_GCC_REV} "${TC_SRC_LLVM_GCC}"
 }
 
 #@ hg-update-llvm        - Update LLVM to the stable revision
 hg-update-llvm() {
   hg-check-if-using-old-repo "${TC_SRC_LLVM}"
   hg-update-common "llvm" ${LLVM_REV} "${TC_SRC_LLVM}"
 }
 
+hg-update-upstream() {
+  hg-update-common "upstream" ${UPSTREAM_REV} "${TC_SRC_UPSTREAM}"
+}
+
 #@ hg-update-newlib      - Update NEWLIB To the stable revision
 hg-update-newlib() {
   # Clean the headers first, so that sanity checks inside
   # hg-update-common do not see any local modifications.
   newlib-nacl-headers-check
   newlib-nacl-headers-clean
   hg-update-common "newlib" ${NEWLIB_REV} "${TC_SRC_NEWLIB}"
   newlib-nacl-headers
 }
 
@@ skipping 91 matching lines @@
 }
 
 hg-pull-llvm-mq-patches() {
   hg-pull "${TC_SRC_LLVM_MQ_PATCHES}"
 }
 
 #@ hg-checkout-all       - check out mercurial repos needed to build toolchain
 #@                          (skips repos which are already checked out)
 hg-checkout-all() {
   StepBanner "HG-CHECKOUT-ALL"
-  hg-checkout-llvm-gcc
-  hg-checkout-llvm
+  if ${UTMAN_UPSTREAM}; then
+    hg-checkout-upstream
+  else
+    hg-checkout-llvm-gcc
+    hg-checkout-llvm
+  fi
   hg-checkout-binutils
   hg-checkout-newlib
   hg-checkout-compiler-rt
   hg-checkout-google-perftools
-  hg-checkout-llvm-mq-patches
-  hg-checkout-llvm-gcc-mq-patches
+  if ${UTMAN_USE_MQ}; then
+    hg-checkout-llvm-mq-patches
+    hg-checkout-llvm-gcc-mq-patches
+  fi
 }
 
 hg-checkout-llvm-gcc() {
   hg-check-if-using-old-repo ${TC_SRC_LLVM_GCC}
   hg-checkout ${REPO_LLVM_GCC} ${TC_SRC_LLVM_GCC} ${LLVM_GCC_REV}
 }
 
 hg-checkout-llvm() {
   hg-check-if-using-old-repo  ${TC_SRC_LLVM}
   hg-checkout ${REPO_LLVM}     ${TC_SRC_LLVM}     ${LLVM_REV}
 }
 
+hg-checkout-upstream() {
+  hg-checkout ${REPO_UPSTREAM} ${TC_SRC_UPSTREAM} ${UPSTREAM_REV}

[jvoung - send to chromium..., 2011/07/28 23:48:54]

Just noticed, but should all the ${TC_SRC...} have quotes around them?

[pdox, 2011/07/29 00:05:55]

Done.

+}
+
 hg-checkout-binutils() {
   hg-checkout ${REPO_BINUTILS} ${TC_SRC_BINUTILS} ${BINUTILS_REV}
 }
 
 hg-checkout-newlib() {
   hg-checkout ${REPO_NEWLIB}   ${TC_SRC_NEWLIB}   ${NEWLIB_REV}
   newlib-nacl-headers
 }
 
 hg-checkout-compiler-rt() {
@@ skipping 105 matching lines @@
 #@ everything            - Build and install untrusted SDK. no translator
 everything() {
 
   mkdir -p "${PNACL_ROOT}"
 
   hg-checkout-all
 
   if ${UTMAN_USE_MQ}; then
     StepBanner "Updating hg sources via MQ=${UTMAN_USE_MQ}";
     setup-hg-mq
+  elif ${UTMAN_UPSTREAM}; then
+    if ! ${UTMAN_UPSTREAM_SKIP_UPDATE}; then
+      StepBanner "Updating upstreaming repository"
+      hg-update-upstream
+    fi
   else
     StepBanner "Updating all hg sources"
     hg-update-llvm-pnacl-sfi
   fi
 
   hg-update-non-llvm
   everything-post-hg
 }
 
 #@ everything-post-hg does everything AFTER hg setup
@@ skipping 2757 matching lines @@
 
 if [ "$(type -t $1)" != "function" ]; then
   #Usage
   echo "ERROR: unknown function '$1'." >&2
   echo "For help, try:"
   echo "    $0 help"
   exit 1
 fi
 
 "$@"