add and enable validator tests for x86

buildbot/buildbot_spec2k.sh

Index: buildbot/buildbot_spec2k.sh
diff --git a/buildbot/buildbot_spec2k.sh b/buildbot/buildbot_spec2k.sh
index 2e903f9d9045863b6c8463ba4658c50ff501639e..723accfa5e2a7c1f3067e087f3c2d6e06fa93afe 100755
--- a/buildbot/buildbot_spec2k.sh
+++ b/buildbot/buildbot_spec2k.sh
@@ -11,19 +11,19 @@ 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)
@@ -31,8 +31,10 @@ 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
@@ -151,6 +153,47 @@ download-test-binaries() {
   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
@@ -246,6 +289,7 @@ pnacl-x8664() {
   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() {
@@ -257,6 +301,7 @@ pnacl-x8632() {
                 SetupPnaclTranslatorX8632Opt"
   build-tests "${setups}" all 1 3
   run-tests "${setups}" all 1 3
+  measure-validator-speed x86-32
 }
 
 nacl-x8632() {
@@ -266,6 +311,7 @@ nacl-x8632() {
                 SetupNaclX8632Opt"
   build-tests "${setups}" all 1 3
   run-tests "${setups}" all 1 3
+  measure-validator-speed x86-32
 }
 
 nacl-x8664() {
@@ -275,6 +321,7 @@ nacl-x8664() {
                 SetupNaclX8664Opt"
   build-tests "${setups}" all 1 3
   run-tests "${setups}" all 1 3
+  measure-validator-speed x86-64
 }