From: Jim Stichnoth <stichnot@chromium.org>
Date: Mon, 16 Nov 2015 20:47:57 +0000 (-0800)
Subject: Subzero: Add a "make check-presubmit" target.
X-Git-Tag: android-x86-7.1-r1~148^2~561
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6c4ad849c747eedda1e1e7568781f95cd1176c49;p=android-x86%2Fexternal-swiftshader.git

Subzero: Add a "make check-presubmit" target.

BUG= none
R=jpp@chromium.org

Review URL: https://codereview.chromium.org/1452553002 .
---

diff --git a/Makefile.standalone b/Makefile.standalone
index f06ec157b..fc1c28d78 100644
--- a/Makefile.standalone
+++ b/Makefile.standalone
@@ -417,16 +417,41 @@ ifeq ($(TARGET),arm32)
   SETUP=SetupGccArmOpt
   SPEC := -O2 --filetype=asm
 endif
-
+SPECFLAGS :=
+SPECBUILDONLY := false
 %.spec2k: % $(OBJDIR)/pnacl-sz make_symlink runtime
-	./pydir/szbuild_spec2k.py -v --force --target=$(TARGETFLAG) $(SPEC) $<
-	( cd ../../../tests/spec2k; \
+	./pydir/szbuild_spec2k.py -v --force \
+          $(SPECFLAGS) --target=$(TARGETFLAG) $(SPEC) $<
+	$(SPECBUILDONLY) || ( cd ../../../tests/spec2k; \
 	 ./run_all.sh RunTimedBenchmarks $(SETUP) train $< )
 
 check-spec: $(ALLSPEC:=.spec2k)
 
 check: check-lit check-unit check-xtest
 
+NPROCS := $(shell grep processor /proc/cpuinfo | wc -l)
+
+check-presubmit:
+	+make -f Makefile.standalone format
+	git diff --quiet
+	+make -f Makefile.standalone \
+          MINIMAL=1 check
+	+make -f Makefile.standalone \
+          DEBUG=1 CHECK_X86_ASM=1 check-unit
+	+make -f Makefile.standalone \
+          check check-spec
+	+make -f Makefile.standalone \
+          SPECFLAGS='-Om1' SPECBUILDONLY=true check-spec
+	+make -f Makefile.standalone \
+          SPECFLAGS='--sz=--phi-edge-split=0' check-spec
+	+make -f Makefile.standalone \
+          TARGET=arm32 SPECBUILDONLY=true check-spec
+	+make -f Makefile.standalone \
+          TARGET=arm32 SPECFLAGS='-Om1' SPECBUILDONLY=true check-spec
+	+make -f Makefile.standalone \
+          TARGET=arm32 ALLSPEC='176.gcc 181.mcf 254.gap' check-spec
+	echo Success
+
 FORMAT_BLACKLIST =
 # Add one of the following lines for each source file to ignore.
 FORMAT_BLACKLIST += ! -name IceParseInstsTest.cpp
diff --git a/pydir/szbuild_spec2k.py b/pydir/szbuild_spec2k.py
index 84106bb9d..7acf789d0 100755
--- a/pydir/szbuild_spec2k.py
+++ b/pydir/szbuild_spec2k.py
@@ -33,9 +33,18 @@ def main():
         print 'Unknown component{s}: '.format(s='s' if len(bad) > 1 else '') + \
             ' '.join(x for x in bad)
         sys.exit(1)
+
+    # Fix up Subzero target strings for the run_all.sh script.
+    target_map = {
+         'arm32':'arm',
+         'x8632':'x8632',
+         'x8664':'x8664'
+         }
+    run_all_target = target_map[args.target] # fail if target not listed above
+
     suffix = (
         'pnacl.opt.{target}' if args.sandbox else 'gcc.opt.{target}').format(
-             target=args.target);
+             target=run_all_target);
     for comp in args.comps:
         name = os.path.splitext(comp)[1] or comp
         if name[0] == '.':