Skip to content

S
swiftshader
Commit c8f56a39 by Jim Stichnoth
Options

Subzero: Fix "make presubmit" for spec -Om1.

For the Om1 spec tests, we were generating commands like this: ./pydir/szbuild_spec2k.py -v -Om1 --target=x8632 -O2 --filetype=obj 253.perlbmk where -Om1 and -O2 both appear. Python's argparse allows an argument to be set multiple times, and the last one would win, i.e. -O2 is used instead of -Om1. BUG= none R=jpp@chromium.org Review URL: https://codereview.chromium.org/1766603002 .
parent 98ba0066
Showing with 6 additions and 6 deletions
Makefile.standalone
...@@ -503,19 +503,19 @@ TARGET := x8632 ...@@ -503,19 +503,19 @@ TARGET := x8632
ifeq ($(TARGET),x8632) ifeq ($(TARGET),x8632)
TARGETFLAG=x8632 TARGETFLAG=x8632
SETUP=SetupGccX8632Opt SETUP=SetupGccX8632Opt
SPEC := -O2 --filetype=obj SPEC := --filetype=obj
endif endif
ifeq ($(TARGET),x8664) ifeq ($(TARGET),x8664)
TARGETFLAG=x8664 TARGETFLAG=x8664
SETUP=SetupGccX8664Opt SETUP=SetupGccX8664Opt
SPEC := -O2 --filetype=obj SPEC := --filetype=obj
endif endif
ifeq ($(TARGET),arm32) ifeq ($(TARGET),arm32)
TARGETFLAG=arm32 TARGETFLAG=arm32
SETUP=SetupGccArmOpt SETUP=SetupGccArmOpt
SPEC := -O2 --filetype=obj SPEC := --filetype=obj
endif endif
SPECFLAGS := SPECFLAGS := -O2
SPECBUILDONLY := false SPECBUILDONLY := false
%.spec2k: % $(OBJDIR)/pnacl-sz make_symlink runtime %.spec2k: % $(OBJDIR)/pnacl-sz make_symlink runtime
./pydir/szbuild_spec2k.py -v \ ./pydir/szbuild_spec2k.py -v \
...@@ -553,10 +553,10 @@ check-presubmit presubmit: ...@@ -553,10 +553,10 @@ check-presubmit presubmit:
SPECFLAGS='-Om1' TARGET=x8664 SPECBUILDONLY=true check-spec SPECFLAGS='-Om1' TARGET=x8664 SPECBUILDONLY=true check-spec
# Run spec2k for x86-32 without advanced phi lowering. # Run spec2k for x86-32 without advanced phi lowering.
+make -f Makefile.standalone \ +make -f Makefile.standalone \
SPECFLAGS='--sz=--phi-edge-split=0' check-spec SPECFLAGS='-O2 --sz=--phi-edge-split=0' check-spec
# Run spec2k for x86-64 without advanced phi lowering. # Run spec2k for x86-64 without advanced phi lowering.
+make -f Makefile.standalone \ +make -f Makefile.standalone \
SPECFLAGS='--sz=--phi-edge-split=0' TARGET=x8664 check-spec SPECFLAGS='-O2 --sz=--phi-edge-split=0' TARGET=x8664 check-spec
# Run cross tests and lit tests to validate filetype=asm output. # Run cross tests and lit tests to validate filetype=asm output.
+make -f Makefile.standalone \ +make -f Makefile.standalone \
FORCEASM=1 check-xtest check-lit FORCEASM=1 check-xtest check-lit
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment