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 494 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 \
+          runtime/szrt_asm_mips32.s \
+          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_native_mips32.o build/runtime/szrt_sb_mips32.o \
           build/runtime/szrt_asan_x8632.o build/runtime/szrt_asan_x8664.o \
           build/runtime/szrt_asan_arm32.o
 
 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
@@ skipping 21 matching lines @@
           $(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 \
+          -i mips32 \

[Jim Stichnoth, 2016/08/23 14:56:48]

Change these two mips32 lines to this single line:
  -i mips32,native,Om1,simple_loop

This restricts the mips32 cross tests to the single currently working test, when
"make -f Makefile.standalone check-xtest" is run.

[Jim Stichnoth, 2016/09/02 15:49:31]

Update: After you "git pull --rebase" to pull in
https://codereview.chromium.org/2271053006/ , put "-i
mips32,native,Om1,simple_loop" in the "ifdef MIPS" section.

[obucinac, 2016/09/05 16:55:59]

Done.

+          -i mips32,native \
           -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 crosstest/test_arith_ll.ll
        # 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 \
@@ skipping 35 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)

[Jim Stichnoth, 2016/08/23 14:56:48]

Should probably add a comment noting that
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 here.

[obucinac, 2016/09/05 16:55:59]

Done.

+  TARGETFLAG=mips32
+  SETUP=SetupGccMipsOpt
+  ;SPEC := --filetype=asm

[Jim Stichnoth, 2016/08/23 14:56:48]

Remove the ';'.

(Not sure if that was meant as a comment character which is actually '#', but
this line without the ';' should be correct.)

[obucinac, 2016/09/05 16:55:59]

Done.

+endif
 SPECFLAGS := -O2
 SPECRUN := --run
 %.spec2k: % $(OBJDIR)/pnacl-sz make_symlink runtime
         ./pydir/szbuild_spec2k.py -v \
           $(SPECFLAGS) --target=$(TARGETFLAG) $(SPEC) $< $(SPECRUN)
 
 check-spec: exists-spec $(ALLSPEC:=.spec2k)
 
 check: check-lit check-unit check-xtest
 
@@ skipping 165 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/