Subzero: Add presubmit-lite target.

Makefile.standalone

 # The following variables will likely need to be modified, depending on where
 # and how you built LLVM & Clang. They can be overridden in a command-line
 # invocation of make, like:
 #
 #   make LLVM_SRC_PATH=<path> LIBCXX_INSTALL_PATH=<path> CLANG_PATH=<path> \
 #        PNACL_BIN_PATH=<path> ...
 #
 
 # LLVM_SRC_PATH is the path to the root of the checked out source code. This
 # directory should contain the configure script, the include/ and lib/
@@ skipping 336 matching lines @@
     AssemblerX8664/Other.cpp
 endif
 
 UNITTEST_OBJS = $(patsubst %.cpp, $(OBJDIR)/unittest/%.o, $(UNITTEST_SRCS))
 UNITTEST_LIB_OBJS = $(filter-out $(OBJDIR)/main.o,$(OBJS))
 
 NEXES = $(SB_OBJDIR)/pnacl-sz.x8632.nexe \
         $(SB_OBJDIR)/pnacl-sz.x8664.nexe \
         $(SBB_OBJDIR)/pnacl_public_x86_32_pnacl_sz_nexe \
         $(SBB_OBJDIR)/pnacl_public_x86_64_pnacl_sz_nexe
+NEXES_LITE = $(SB_OBJDIR)/pnacl-sz.x8664.nexe

[Eric Holk, 2016/03/21 18:26:38]

Does this bake in the assumption that PNaCl developers are always developing on
x86-64 machines?

[Jim Stichnoth, 2016/03/21 18:59:33]

Not really.  This just picks one nexe to push all the way through to.  Note that
presubmit doesn't actually run any execution tests on the nexes.  If it did, the
expectation is that the run.py script would handle qemu emulation or whatever
was required for local platform execution.

[Eric Holk, 2016/03/21 19:20:48]

Okay, cool.

 
 # Keep all the first target so it's the default.
 all: $(OBJDIR)/pnacl-sz make_symlink runtime
 
 ifdef TSAN
-sb:
+sb sb-lite:
         @echo "Skipping pnacl-sz.*.nexe: TSAN isn't supported under NaCl."
 else
 sb: $(NEXES) sb_make_symlink exists-sbtc
+sb-lite: $(NEXES_LITE) exists-sbtc
 endif
 
 # SHOW_BUILD_ATTS is an executable that is run to show what build
 # attributes were used to build pnacl-sz.
 SHOW_BUILD_ATTS = $(OBJDIR)/pnacl-sz --build-atts
 
 # Creates symbolic link so that testing is easier. Also runs
 # pnacl-sz to verify that the defines flags have valid values,
 # as well as describe the corresponding build attributes.
 make_symlink: $(OBJDIR)/pnacl-sz
@@ skipping 109 matching lines @@
 runtime.is.built: $(RT_SRC) pydir/build-runtime.py
         @echo ================ Building Subzero runtime ================
         ./pydir/build-runtime.py -v --pnacl-root $(PNACL_TOOLCHAIN_ROOT)
 
 check-lit: $(OBJDIR)/pnacl-sz make_symlink
         PNACL_BIN_PATH=$(PNACL_BIN_PATH) \
         $(LLVM_SRC_PATH)/utils/lit/lit.py -sv $(CHECK_LIT_TESTS) \
             $(FORCEASM_LIT_TEST_EXCLUDES) $(FORCEASM_LIT_PARAM)
 
 ifdef MINIMAL
-check-xtest: $(OBJDIR)/pnacl-sz make_symlink runtime
+check-xtest check-xtest-lite: $(OBJDIR)/pnacl-sz make_symlink runtime
         @echo "Crosstests disabled, minimal build"
 else
 check-xtest: $(OBJDIR)/pnacl-sz make_symlink runtime \
   exists-nonsfi-x8632 exists-nonsfi-arm32
        # Do all native/sse2 tests, but only test_vector_ops for native/sse4.1.
        # For (slow) sandboxed tests, limit to Om1/sse4.1.
        # run.py (used to run the sandboxed xtests) does not support
        # specifying -cpu cortex-a15 to qemu, hence we disable the
        # hwdiv-arm tests.
         ./pydir/crosstest_generator.py -v --lit \
           --toolchain-root $(TOOLCHAIN_ROOT) \
           $(FORCEASM_FLAG) \
           $(FORCEASM_XTEST_EXCLUDES) \
           -i x8632,native,sse2 \
           -i x8632,native,sse4.1,test_vector_ops \
           -i x8632,sandbox,sse4.1,Om1 \
           -i x8632,nonsfi,sse2,O2 \
           -i x8664,native,sse2 \
           -i x8664,native,sse4.1,test_vector_ops \
           -i x8664,sandbox,sse4.1,Om1 \
           -i arm32 \
           -e arm32,sandbox,hwdiv-arm
         PNACL_BIN_PATH=$(PNACL_BIN_PATH) \
         $(LLVM_SRC_PATH)/utils/lit/lit.py -sv $(CHECK_XTEST_TESTS)
+check-xtest-lite: $(OBJDIR)/pnacl-sz make_symlink runtime \
+  exists-nonsfi-x8632 exists-nonsfi-arm32
+       # Do all native/sse2/neon tests, which are relatively fast.
+       # Limit to test_global+mem_intrin for sandbox+nonsfi because sandbox and
+       # nonsfi builds are slow, and test_global and mem_intrin are the most
+       # common sources of problems.
+        ./pydir/crosstest_generator.py -v --lit \
+          --toolchain-root $(TOOLCHAIN_ROOT) \
+          $(FORCEASM_FLAG) \
+          $(FORCEASM_XTEST_EXCLUDES) \
+          -i x8632,native,sse2,O2 \
+          -i x8664,native,sse2,O2 \
+          -i arm32,native,neon,O2 \
+          -i x8632,sse2,O2,test_global \
+          -i x8632,sse2,O2,mem_intrin \
+          -i x8664,sse2,O2,test_global \
+          -i x8664,sse2,O2,mem_intrin \
+          -i arm32,neon,O2,test_global \
+          -i arm32,neon,O2,mem_intrin \
+          -e x8664,nonsfi
+        PNACL_BIN_PATH=$(PNACL_BIN_PATH) \
+        $(LLVM_SRC_PATH)/utils/lit/lit.py -sv $(CHECK_XTEST_TESTS)
 endif
 
 check-unit: $(OBJDIR)/run_unittests
         $(OBJDIR)/run_unittests
 
 # List the spec2k components in roughly reverse order of runtime, to help with
 # parallel execution speed.
 ALLSPEC := 253.perlbmk 177.mesa 188.ammp 256.bzip2 164.gzip 179.art 183.equake \
            175.vpr 176.gcc 181.mcf 186.crafty 197.parser 254.gap 255.vortex \
            300.twolf 252.eon
@@ skipping 106 matching lines @@
 # Build spec2k under -Om1/arm32.
         +make -f Makefile.standalone \
           TARGET=arm32 SPECFLAGS='-Om1' SPECBUILDONLY=true check-spec
 # Run a few spec2k tests for arm32 using qemu. Keep the list sorted in
 # roughly reverse order of runtime.
         +make -f Makefile.standalone \
           TARGET=arm32 ALLSPEC='252.eon 254.gap 176.gcc 181.mcf' check-spec
 # Provide validation of user awesomeness!
         echo Success
 
+presubmit-lite: exists-nonsfi-x8632 exists-nonsfi-arm32 \
+  exists-sbtc exists-spec
+# Make sure clang-format gets run.
+        +make -f Makefile.standalone format
+# Verify MINIMAL build, plus proper usage of REQUIRES in lit tests.
+        +make -f Makefile.standalone \
+          MINIMAL=1 check $(SB_OBJDIR)/pnacl-sz.x8664.nexe
+# Check that there are no g++ build errors or warnings.
+        +make -f Makefile.standalone \
+          GPLUSPLUS=1 compile_only
+# Run lit tests, cross tests, unit tests, and spec2k/x86-32.
+        +make -f Makefile.standalone \
+          check-lit check-unit check-spec
+        +make -f Makefile.standalone \
+          check-xtest-lite
+# Run spec2k/x86-64.
+        +make -f Makefile.standalone \
+          TARGET=x8664 check-spec
+# Build spec2k under -Om1/x86-32, to check for liveness errors.
+        +make -f Makefile.standalone \
+          SPECFLAGS='-Om1' SPECBUILDONLY=true check-spec
+# Build spec2k under -Om1/x86-64, to check for liveness errors.
+        +make -f Makefile.standalone \
+          SPECFLAGS='-Om1' TARGET=x8664 SPECBUILDONLY=true check-spec
+# Run cross tests and lit tests to validate filetype=asm output.
+        +make -f Makefile.standalone \
+          FORCEASM=1 check-lit
+        +make -f Makefile.standalone \
+          FORCEASM=1 check-xtest-lite
+# Build spec2k under -Om1/arm32.
+        +make -f Makefile.standalone \
+          TARGET=arm32 SPECFLAGS='-Om1' SPECBUILDONLY=true check-spec
+# Run a few spec2k tests for arm32 using qemu. Keep the list sorted in
+# roughly reverse order of runtime.
+        +make -f Makefile.standalone \
+          TARGET=arm32 ALLSPEC='254.gap 176.gcc 181.mcf' check-spec
+# Provide validation of user awesomeness!
+        echo Success
+
 FORMAT_BLACKLIST =
 # Add one of the following lines for each source file to ignore.
 FORMAT_BLACKLIST += ! -name IceParseInstsTest.cpp
 FORMAT_BLACKLIST += ! -name IceParseTypesTest.cpp
 FORMAT_BLACKLIST += ! -name assembler_arm.h
 FORMAT_BLACKLIST += ! -name assembler_arm.cc
 format:
         $(CLANG_FORMAT_PATH)/clang-format -style=LLVM -i \
           `find . -regex '.*\.\(c\|h\|cpp\)' $(FORMAT_BLACKLIST)`
 
@@ skipping 25 matching lines @@
 
 help-check-xtest:
         @cat Makefile.standalone-help/check-xtest.txt
 
 clean:
         rm -rf pnacl-sz *.o $(foreach nexe,$(NEXES),$(notdir $(nexe))) \
           $(OBJDIR) $(SB_OBJDIR) $(SBB_OBJDIR) build/*.bloat.json
 
 clean-all: clean
         rm -rf build/ crosstest/Output/