Subzero, MIPS32: Cross-testing enabled for MIPS32

Makefile.standalone

Index: Makefile.standalone
diff --git a/Makefile.standalone b/Makefile.standalone
index e40e4a3b292bb83afd4417f18f5f39ab1c1bbc5c..7bd98289fa4c90cc546e37f4787ad32e877cb112 100644
--- a/Makefile.standalone
+++ b/Makefile.standalone
@@ -513,7 +513,8 @@ $(OBJDIR)/unittest/AssemblerX8664: $(OBJDIR)/unittest
 
 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 \
@@ -523,6 +524,14 @@ RT_OBJ := build/runtime/szrt_native_x8632.o build/runtime/szrt_sb_x8632.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
@@ -531,7 +540,8 @@ runtime: $(RT_OBJ)
 $(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) \
@@ -552,7 +562,8 @@ check-xtest check-xtest-lite: $(OBJDIR)/pnacl-sz make_symlink runtime \
           $(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
@@ -631,6 +642,14 @@ ifeq ($(TARGET),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