Subzero, MIPS32: Cross-testing enabled for MIPS32

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 495 matching lines @@
 $(OBJDIR)/unittest: $(OBJDIR)
         @mkdir -p $@
 
 $(OBJDIR)/unittest/AssemblerX8632: $(OBJDIR)/unittest
         @mkdir -p $@
 $(OBJDIR)/unittest/AssemblerX8664: $(OBJDIR)/unittest
         @mkdir -p $@
 
 RT_SRC := runtime/szrt.c runtime/szrt_ll.ll runtime/szrt_profiler.c \
           runtime/szrt_asm_x8632.s runtime/szrt_asm_x8664.s \
-          runtime/szrt_asm_arm32.s runtime/szrt_asan.c
+          runtime/szrt_asm_arm32.s \

[Jim Stichnoth, 2016/09/23 05:29:11]

Revert this change?  (i.e. put them on the same line)

[obucinac, 2016/09/23 13:22:02]

Done.

+          runtime/szrt_asan.c
 RT_OBJ := build/runtime/szrt_native_x8632.o build/runtime/szrt_sb_x8632.o \
           build/runtime/szrt_nonsfi_x8632.o \
           build/runtime/szrt_native_x8664.o build/runtime/szrt_sb_x8664.o \
           build/runtime/szrt_nonsfi_x8664.o \
           build/runtime/szrt_native_arm32.o build/runtime/szrt_sb_arm32.o \
           build/runtime/szrt_nonsfi_arm32.o \
           build/runtime/szrt_asan_x8632.o build/runtime/szrt_asan_x8664.o \
           build/runtime/szrt_asan_arm32.o
 
+EXCLUDED_RT :=
+ifdef MIPS
+RT_SRC += runtime/szrt_asm_mips32.s
+RT_OBJ += build/runtime/szrt_native_mips32.o build/runtime/szrt_sb_mips32.o
+else
+EXCLUDED_RT += --exclude-target=mips32
+endif
+
 runtime: $(RT_OBJ)
 
 # Use runtime.is.built so that build-runtime.py is invoked only once
 # even in a parallel build.
 .INTERMEDIATE: runtime.is.built
 $(RT_OBJ): runtime.is.built
 runtime.is.built: $(RT_SRC) pydir/build-runtime.py
         @echo ================ Building Subzero runtime ================
-        ./pydir/build-runtime.py -v --pnacl-root $(PNACL_TOOLCHAIN_ROOT)
+        ./pydir/build-runtime.py -v --pnacl-root $(PNACL_TOOLCHAIN_ROOT) \
+            $(EXCLUDED_RT)
 
 check-lit: $(OBJDIR)/pnacl-sz make_symlink runtime
         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 check-xtest-lite: $(OBJDIR)/pnacl-sz make_symlink runtime
         @echo "Crosstests disabled, minimal build"
 else
 ifdef MIPS
 check-xtest check-xtest-lite: $(OBJDIR)/pnacl-sz make_symlink runtime \
   crosstest/test_arith_ll.ll
        # Do all x8664/native/sse2 tests as a smoke test.
        # Add in mips32 tests as they come online.
         ./pydir/crosstest_generator.py -v --lit \
           --toolchain-root $(TOOLCHAIN_ROOT) \
           $(FORCEASM_FLAG) \
           $(FORCEASM_XTEST_EXCLUDES) \
           -i x8664,native,sse2 \
-          -i mips32,xxx
+          -i mips32,native,Om1,simple_loop \
+          -i mips32,native,Om1,test_strengthreduce
         PNACL_BIN_PATH=$(PNACL_BIN_PATH) \
         $(LLVM_SRC_PATH)/utils/lit/lit.py -sv $(CHECK_XTEST_TESTS)
 else
 check-xtest: $(OBJDIR)/pnacl-sz make_symlink runtime \
   exists-nonsfi-x8632 exists-nonsfi-arm32 crosstest/test_arith_ll.ll
        # 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.
@@ skipping 58 matching lines @@
 ifeq ($(TARGET),x8664)
   TARGETFLAG=x8664
   SETUP=SetupGccX8664Opt
   SPEC := --filetype=obj
 endif
 ifeq ($(TARGET),arm32)
   TARGETFLAG=arm32
   SETUP=SetupGccArmOpt
   SPEC := --filetype=obj
 endif
+ifeq ($(TARGET),mips32)
+  # native_client/tests/spec2k/{Makefile.common,run_all.sh} do not currently
+  # have MIPS configs, so those would need to be added for proper Subzero
+  # testing.
+  TARGETFLAG=mips32
+  SETUP=SetupGccMipsOpt
+  SPEC := --filetype=asm
+endif
 SPECFLAGS := -O2
 SPECRUN := --run
 %.spec2k: % $(OBJDIR)/pnacl-sz make_symlink runtime
         ./pydir/szbuild_spec2k.py -v \
           $(SPECFLAGS) --target=$(TARGETFLAG) $(SPEC) $< $(SPECRUN)
 
 ifdef MIPS
 # Don't test spec2k on mips32, at least not yet.
 check-spec:
 else
@@ skipping 190 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/