Allow conditional lit tests in Subzero, based on build flags.

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> LLVM_BIN_PATH=<path> \
 #        LIBCXX_INSTALL_PATH=<path> CLANG_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 19 matching lines @@
 
 HOST_ARCH ?= x86_64
 ifeq ($(HOST_ARCH),x86_64)
   HOST_FLAGS = -m64 -stdlib=libc++
 else
   ifeq ($(HOST_ARCH),x86)
     HOST_FLAGS = -m32 -stdlib=libc++
   endif
 endif
 
+# The list of attributes associated with the built executable. 
+BUILD_ATTS =
+
+ifdef MINIMAL
+  OBJDIR := build/min

[Jim Stichnoth, 2014/10/15 03:16:36]

It looks like this creates subdirs build/Release and build/Release+Asserts, but
then build/min/Release and build/min/Release+Asserts etc.

Can we keep it flat, like build/Release+Min, build/Release+Asserts+Min, etc., or
something like that?

[Karl, 2014/10/15 20:12:31]

Done.

+  BUILD_ATTS := $(BUILD_ATTS) minimal p2i

[Jim Stichnoth, 2014/10/15 03:16:36]

I think the logic of "minimal" is backwards.

None of the tests strictly require the minimal build.  However, some of them
will require the non-minimal build.

Should we instead be adding a nonminimal attribute to the non-minimal builds.

[Karl, 2014/10/15 20:12:31]

A better choice would be to put "minimal" when minimal, and "nonminimal"
otherwise. That way, there is always a build attribute to check. Changing to
meet this choice.

+else
+  OBJDIR = build
+  BUILD_ATTS := $(BUILD_ATTS) p2i l2i lc2i
+endif
+
 ifdef DEBUG
-  OBJDIR = build/Debug
+  OBJDIR := $(OBJDIR)/Debug
   OPTLEVEL = -O0
+  BUILD_ATTS := $(BUILD_ATTS) debug
 else
-  OBJDIR = build/Release
+  OBJDIR := $(OBJDIR)/Release
   OPTLEVEL = -O2
+  BUILD_ATTS := $(BUILD_ATTS) release
 endif
 
 ifdef NOASSERT
   ASSERTIONS = -DNDEBUG
 else
   ASSERTIONS =
   OBJDIR := $(OBJDIR)+Asserts
+  BUILD_ATTS := $(BUILD_ATTS) asserts
 endif
 
 $(info -----------------------------------------------)
 $(info Using LLVM_SRC_PATH = $(LLVM_SRC_PATH))
 $(info Using LLVM_BIN_PATH = $(LLVM_BIN_PATH))
 $(info Using LIBCXX_INSTALL_PATH = $(LIBCXX_INSTALL_PATH))
 $(info Using CLANG_PATH = $(CLANG_PATH))
 $(info Using HOST_ARCH     = $(HOST_ARCH))
 $(info -----------------------------------------------)
 
 LLVM_CXXFLAGS := `$(LLVM_BIN_PATH)/llvm-config --cxxflags`
 LLVM_LDFLAGS := `$(LLVM_BIN_PATH)/llvm-config --libs` \
                 `$(LLVM_BIN_PATH)/llvm-config --ldflags`
 
 # It's recommended that CXX matches the compiler you used to build LLVM itself.
 CCACHE := `command -v ccache`
 CXX := CCACHE_CPP2=yes $(CCACHE) $(CLANG_PATH)/clang++
 
 CXXFLAGS := $(LLVM_CXXFLAGS) -std=c++11 -Wall -Wextra -Werror -fno-rtti \
         -fno-exceptions $(OPTLEVEL) $(ASSERTIONS) -g $(HOST_FLAGS) \
         -Wno-error=unused-parameter -I$(LIBCXX_INSTALL_PATH)/include/c++/v1
 LDFLAGS := $(HOST_FLAGS) -L$(LIBCXX_INSTALL_PATH)/lib
 
+ifdef MINIMAL
+  CXXFLAGS :=$(CXXFLAGS) -DSZ_MINIMAL

[Jim Stichnoth, 2014/10/15 03:16:36]

I started thinking that maybe instead of a single define like SZ_MINIMAL, we
should have separate flags, e.g.
  -DNDEBUG
  -DNO_TEXT_ASM
  -DNO_DUMP
  -DNO_LLVM_CL
etc.

But maybe -DSZ_MINIMAL -DNDEBUG is a reasonable placeholder for now.

[Karl, 2014/10/15 20:12:31]

Went ahead and added multiple flags for corresponding concepts.

+endif
+
 SRCS= \
         assembler.cpp \
         assembler_ia32.cpp \
         IceCfg.cpp \
         IceCfgNode.cpp \
         IceConverter.cpp \
         IceGlobalContext.cpp \
         IceGlobalInits.cpp \
         IceInst.cpp \
         IceInstX8632.cpp \
@@ skipping 11 matching lines @@
         IceTypes.cpp \
         llvm2ice.cpp \
         PNaClTranslator.cpp
 
 OBJS=$(patsubst %.cpp, $(OBJDIR)/%.o, $(SRCS))
 
 # Keep all the first target so it's the default.
 all: $(OBJDIR)/llvm2ice make_symlink
 
 make_symlink: $(OBJDIR)/llvm2ice
-        rm -f llvm2ice
+        rm -f llvm2ice llvm2ice.build_atts
         ln -s $(OBJDIR)/llvm2ice
+        ln -s $(OBJDIR)/llvm2ice.build_atts
 
 .PHONY: all make_symlink
 
 $(OBJDIR)/llvm2ice: $(OBJS)
         $(CXX) $(LDFLAGS) -o $@ $^ $(LLVM_LDFLAGS) -ldl \
                -Wl,-rpath=$(abspath $(LIBCXX_INSTALL_PATH)/lib)
+        echo "$(BUILD_ATTS)" > $@.build_atts
 
 # TODO: Be more precise than "*.h" here and elsewhere.
 $(OBJS): $(OBJDIR)/%.o: src/%.cpp src/*.h src/*.def
         $(CXX) -c $(CXXFLAGS) $< -o $@
 
 $(OBJS): | $(OBJDIR)
 
 $(OBJDIR):
         @mkdir -p $@
 
@@ skipping 17 matching lines @@
 ifeq (,$(wildcard /usr/lib/clang-format/clang-format-diff.py))
   CLANG_FORMAT_DIFF = clang-format-diff.py
 else
   CLANG_FORMAT_DIFF = /usr/lib/clang-format/clang-format-diff.py
 endif
 format-diff:
         git diff -U0 `git merge-base HEAD master` | \
         $(CLANG_FORMAT_DIFF) -p1 -style=LLVM -i
 
 clean:
-        rm -rf llvm2ice *.o build/
+        rm -rf llvm2ice llvm2ice.build_atts *.o $(OBJDIR)

[Jim Stichnoth, 2014/10/15 03:16:36]

Shouldn't "make clean" remove the entire build/ directory, instead of
potentially having to run 8 different "make clean" variants?

[Karl, 2014/10/15 20:12:31]

Added "clean-all" to clean all.