Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(88)

Unified Diff: Makefile.standalone

Issue 1531623007: Add option to force filetype=asm for testing (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Formatting Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | pydir/crosstest_generator.py » ('j') | pydir/run-pnacl-sz.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Makefile.standalone
diff --git a/Makefile.standalone b/Makefile.standalone
index 6c976e4f4b56c6eeaccffede1bdc760b73120bff..4c562408788280b7eea125f47293576625f81925 100644
--- a/Makefile.standalone
+++ b/Makefile.standalone
@@ -138,6 +138,16 @@ ifdef MSAN
LD_EXTRA += -fsanitize=memory
endif
+ifdef FORCEASM
+ FORCEASM_FLAG = --filetype=asm
+ FORCEASM_XTEST_EXCLUDES = -e x8632,sandbox,test_sync_atomic
Jim Stichnoth 2015/12/20 18:42:23 Explain this, e.g.: # With --filetype=asm and --s
sehr 2016/01/07 18:53:11 Done.
+ FORCEASM_LIT_PARAM = --param=FORCEASM
+else
+ FORCEASM_FLAG =
+ FORCEASM_XTEST_EXCLUDES =
+ FORCEASM_LIT_PARAM =
+endif
+
SB_OBJDIR := $(OBJDIR)+Sandboxed
$(info -----------------------------------------------)
@@ -384,7 +394,7 @@ runtime.is.built: $(RT_SRC) pydir/build-runtime.py
check-lit: $(OBJDIR)/pnacl-sz make_symlink
PNACL_BIN_PATH=$(PNACL_BIN_PATH) \
- $(LLVM_SRC_PATH)/utils/lit/lit.py -sv tests_lit
+ $(LLVM_SRC_PATH)/utils/lit/lit.py -sv tests_lit $(FORCEASM_LIT_PARAM)
ifdef MINIMAL
check-xtest: $(OBJDIR)/pnacl-sz make_symlink runtime
@@ -397,6 +407,8 @@ check-xtest: $(OBJDIR)/pnacl-sz make_symlink runtime
# TODO(jpp): reenable the x86-64 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 \
@@ -464,6 +476,9 @@ check-presubmit presubmit:
# Run spec2k for x86-32 without advanced phi lowering.
+make -f Makefile.standalone \
SPECFLAGS='--sz=--phi-edge-split=0' check-spec
+# Run cross tests to check for regressions in filetype=asm
Jim Stichnoth 2015/12/20 18:42:23 How about more positive phrasing: Run cross test
sehr 2016/01/07 18:53:11 Done.
+ +make -f Makefile.standalone \
+ check-xtest FORCEASM=1
# Build spec2k for arm32.
+make -f Makefile.standalone \
TARGET=arm32 SPECBUILDONLY=true check-spec
« no previous file with comments | « no previous file | pydir/crosstest_generator.py » ('j') | pydir/run-pnacl-sz.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698