add and enable validator tests for x86

buildbot/buildbot_spec2k.sh

 #!/bin/bash
 # Copyright (c) 2012 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.
 
 set -o xtrace
 set -o nounset
 set -o errexit
 
 ######################################################################
 # SCRIPT CONFIG
 ######################################################################
 
-CLOBBER=${CLOBBER:-yes}
-SCONS_TRUSTED="./scons --mode=opt-host -j8"
-SCONS_NACL="./scons --mode=opt-host,nacl -j8"
-SPEC_HARNESS=${SPEC_HARNESS:-${HOME}/cpu2000-redhat64-ia32}/
+readonly CLOBBER=${CLOBBER:-yes}
+readonly SCONS_TRUSTED="./scons --mode=opt-host -j8"
+readonly SCONS_NACL="./scons --mode=opt-host,nacl -j8"
+readonly SPEC_HARNESS=${SPEC_HARNESS:-${HOME}/cpu2000-redhat64-ia32}/
 
-TRYBOT_TESTS="176.gcc 179.art 181.mcf 197.parser 252.eon 254.gap"
-TRYBOT_TRANSLATOR_TESTS="176.gcc"
-TRYBOT_X86_64_ZERO_BASED_SANDBOX_TESTS="176.gcc"
+readonly TRYBOT_TESTS="176.gcc 179.art 181.mcf 197.parser 252.eon 254.gap"
+readonly TRYBOT_TRANSLATOR_TESTS="176.gcc"
+readonly TRYBOT_X86_64_ZERO_BASED_SANDBOX_TESTS="176.gcc"
 
 readonly BUILDBOT_PNACL="buildbot/buildbot_pnacl.sh"
 readonly UP_DOWN_LOAD="buildbot/file_up_down_load.sh"
 
-SPEC_BASE="tests/spec2k"
+readonly SPEC_BASE="tests/spec2k"
 readonly ARCHIVE_NAME=$(${SPEC_BASE}/run_all.sh GetTestArchiveName)
 
 readonly NAME_ARM_TRY_UPLOAD=$(${BUILDBOT_PNACL} NAME_ARM_TRY_UPLOAD)
 readonly NAME_ARM_TRY_DOWNLOAD=$(${BUILDBOT_PNACL} NAME_ARM_TRY_DOWNLOAD)
 readonly NAME_ARM_UPLOAD=$(${BUILDBOT_PNACL} NAME_ARM_UPLOAD)
 readonly NAME_ARM_DOWNLOAD=$(${BUILDBOT_PNACL} NAME_ARM_DOWNLOAD)
 
+readonly QEMU_TOOL="$(pwd)/toolchain/linux_arm-trusted/run_under_qemu_arm"
+
 # If true, terminate script when first error is encountered.
-FAIL_FAST=${FAIL_FAST:-false}
+readonly FAIL_FAST=${FAIL_FAST:-false}
 RETCODE=0
 
 # Print the number of tests being run for the buildbot status output
 testcount() {
   local tests="$1"
   if [[ ${tests} == "all" ]]; then
     echo "all"
   else
     echo ${tests} | wc -w
   fi
@@ skipping 98 matching lines @@
   else
     ${UP_DOWN_LOAD} DownloadArmBinariesForHWBots ${NAME_ARM_DOWNLOAD} \
       ${ARCHIVE_NAME}
   fi
   echo "@@@BUILD_STEP spec2k untar@@@"
   pushd ${SPEC_BASE}
   ./run_all.sh UnpackArmBinaries
   popd
 }
 
+download-validator-test-nexes() {
+  local arch="$1"
+  echo "@@@BUILD_STEP validator test download@@@"
+  ${UP_DOWN_LOAD} DownloadArchivedNexes 1000 "${arch}_giant" giant_nexe.tar.bz2
+  # This generates "CannedNexes/" in the current directory
+ rm -rf CannedNexes

[jvoung - send to chromium..., 2012/11/14 18:45:30]

Indentation is a bit inconsistent in these couple of functions.

What generates the giant_nexe.tar.bz2?

[Robert Muth (chromium), 2012/11/15 05:25:35]

Done.

+ tar jxf  giant_nexe.tar.bz2
+}
+
+get-validator() {
+  local arch="$1"
+  if [[ ${arch} == "x86-32" ]] ; then
+      echo "$(pwd)/scons-out/opt-linux-x86-32/staging/ncval"
+  elif [[ ${arch} == "x86-64" ]] ; then
+      echo "$(pwd)/scons-out/opt-linux-x86-64/staging/ncval"
+  elif [[ ${arch} == "arm" ]] ; then
+      echo "$(pwd)/scons-out/opt-linux-arm/staging/arm-ncval-core"
+  else
+      echo "ERROR: unknown arch"
+  fi
+}
+
+measure-validator-speed() {
+  local arch="$1"
+  local validator=$(get-validator ${arch})
+  echo "@@@BUILD_STEP validator speed test@@@"
+  if [[ ! -e ${validator} ]] ; then
+      echo "ERROR: missing validator executable: ${validator}"
+      handle-error
+      return
+  fi
+
+  if [[ $(uname -p) != arm* ]] ; then
+      validator="${QEMU_TOOL} ${validator}"
+  fi
+
+  for b in CannedNexes/*nexe ; do
+     /usr//bin/time ${validator} $b

[jvoung - send to chromium..., 2012/11/14 18:45:30]

extra slash
/usr//bin

[Robert Muth (chromium), 2012/11/15 05:25:35]

Done.

+  done
+}
+
 ######################################################################
 # NOTE: trybots only runs a subset of the the spec2k tests
 # TODO: elminate this long running bot in favor per arch sharded bots
 pnacl-trybot-arm-qemu() {
   clobber
   build-prerequisites "arm" "bitcode"
   build-tests SetupPnaclArmOpt "${TRYBOT_TESTS}" 0 1
   run-tests SetupPnaclArmOpt "${TRYBOT_TESTS}" 0 1
 }
 
 pnacl-trybot-arm-buildonly() {
   clobber
   build-prerequisites "arm" "bitcode" "arm-ncval-core"
   ${BUILDBOT_PNACL} archive-for-hw-bots "${NAME_ARM_TRY_UPLOAD}" try
   build-tests SetupPnaclPexeOpt "${TRYBOT_TESTS}" 0 1
   upload-test-binaries "${TRYBOT_TESTS}" try
 }
 
 pnacl-trybot-arm-hw() {
   clobber
   ${BUILDBOT_PNACL} unarchive-for-hw-bots "${NAME_ARM_TRY_DOWNLOAD}" try
   download-test-binaries try
   build-tests SetupPnaclTranslatorArmOptHW "${TRYBOT_TESTS}" 0 1
   run-tests SetupPnaclTranslatorArmOptHW "${TRYBOT_TESTS}" 0 1
   pushd ${SPEC_BASE};
   ./run_all.sh TimeValidation SetupPnaclTranslatorArmOptHW "${TRYBOT_TESTS}" ||\

[jvoung - send to chromium..., 2012/11/14 18:45:30]

Can you merge the measure-validator-speed mechanism with this ./run_all.sh
TimeValidation function ?

In the end, you need to be able to print "RESULT ... "

TimeValidation() uses the script tests/spec2k/emit_perf_log.sh to do that
printing.

     handle-error
   popd
 }
 
 pnacl-trybot-x8632() {
   clobber
   build-prerequisites "x86-32" "bitcode"
   build-tests SetupPnaclX8632Opt "${TRYBOT_TESTS}" 0 1
   run-tests SetupPnaclX8632Opt "${TRYBOT_TESTS}" 0 1
   build-tests SetupPnaclTranslatorX8632Opt "${TRYBOT_TRANSLATOR_TESTS}" 0 1
@@ skipping 49 matching lines @@
 pnacl-x8664() {
   clobber
   build-prerequisites "x86-64" "bitcode"
   local setups="SetupPnaclX8664 \
                SetupPnaclX8664Opt \
                SetupPnaclTranslatorX8664 \
                SetupPnaclTranslatorX8664Opt"
   build-tests "${setups}" all 1 3
   run-tests "${setups}" all 1 3
   pnacl-x86-64-zero-based-sandbox
+  measure-validator-speed x86-64
 }
 
 pnacl-x8632() {
   clobber
   build-prerequisites "x86-32" "bitcode"
   local setups="SetupPnaclX8632 \
                 SetupPnaclX8632Opt \
                 SetupPnaclTranslatorX8632 \
                 SetupPnaclTranslatorX8632Opt"
   build-tests "${setups}" all 1 3
   run-tests "${setups}" all 1 3
+  measure-validator-speed x86-32
 }
 
 nacl-x8632() {
   clobber
   build-prerequisites "x86-32" ""
   local setups="SetupNaclX8632 \
                 SetupNaclX8632Opt"
   build-tests "${setups}" all 1 3
   run-tests "${setups}" all 1 3
+  measure-validator-speed x86-32
 }
 
 nacl-x8664() {
   clobber
   build-prerequisites "x86-64" ""
   local setups="SetupNaclX8664 \
                 SetupNaclX8664Opt"
   build-tests "${setups}" all 1 3
   run-tests "${setups}" all 1 3
+  measure-validator-speed x86-64
 }
 
 
 ######################################################################
 # Script assumed to be run in native_client/
 if [[ $(pwd) != */native_client ]]; then
   echo "ERROR: must be run in native_client!"
   exit 1
 fi
 
 
 if [[ $# -eq 0 ]] ; then
   echo "you must specify a mode on the commandline:"
   exit 1
 fi
 
 if [ "$(type -t $1)" != "function" ]; then
   Usage
   echo "ERROR: unknown mode '$1'." >&2
   exit 1
 fi
 
 "$@"
 
 if [[ ${RETCODE} != 0 ]]; then
   echo "@@@BUILD_STEP summary@@@"
   echo There were failed stages.
   exit ${RETCODE}
 fi