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 = x86-32
+
 ifdef DEBUG
   OBJDIR = build/Debug
   OPTLEVEL = -O0
+  BUILD_ATTS := $(BUILD_ATTS) debug
 else
   OBJDIR = build/Release
   OPTLEVEL = -O2
+  BUILD_ATTS := $(BUILD_ATTS) release
+endif
+
+ifdef MINIMAL
+  ASSERTIONS := $(ASSERTIONS) -DNO_TEXT_ASM -DNO_DUMP -DNO_LLVM_CL

[Jim Stichnoth, 2014/10/15 22:23:54]

Maybe name this DEFINES instead of ASSERTIONS, or some other more standard
makefile name?

[Karl, 2014/10/16 16:51:48]

Refactored to use CXX_DEFINES.

+  OBJDIR := $(OBJDIR)+Min
+  BUILD_ATTS := $(BUILD_ATTS) minimal p2i

[jvoung (off chromium), 2014/10/15 21:57:05]

It seems like the builds should always have "p2i" available, since that is to
become the default, so I'm not sure that's worth listing (or prefixing FileCheck
with ifp)?

The difference is more "minimal" vs "nonminimal", and the availability of l2i
and lc2i.

Should a test actually require "nonminimal" vs "minimal" instead of requiring
"l2i" or "lc2i"? Maybe if it's checking for some other misc feature like "dump",
but that could be listed too?

[Karl, 2014/10/16 16:51:48]

I tried to make the decision logic needed for tests to be simple. However, I
guess we only need to put that in test_lits/lit.cfg.
Dropping p2i, l2i, and lc2i.

[jvoung (off chromium), 2014/10/20 17:36:00]

Ah, what I meant was actually that a list of features might make more sense than
"minimal vs nonminimal", but there is a baseline set of features that always
exist which you shouldn't need to list in tests (e.g., p2i). So, kind of like
what you had before =( Sorry for the confusion.

Maybe something baseline like p2i could be listed here in the BUILD_ATTS, but
I'm not sure you want to make every test check for it via %ifp. It could be
broadly checked for a whole set of tests in a lit.cfg file without as many files
to change I guess.

My thought on why features instead of "nonminimal": it makes it more clear what
features are part of "nonminimal", and makes it clear which feature of
nonminimal the test is requiring. You've done that in the lit.cfg layer by
translating between this and the various %if forms.

On the other hand, maybe there is an argument for "minimal": I can imagine there
might be a test that tried to run "llvm2ice --verbose foo", and was expecting
that this *fail* because it is actually pruned out. There might be other ways to
check minimalness though. E.g., using features, but inverting the condition on
the %if?

Thoughts?

[Karl, 2014/10/20 21:00:42]

Talked with Jim, and decided that:

1) We assume that p2i is always built, and hence not an attribute.

2) Removed minimal/nonminimal attributes, since they can too easily change with
time.

3) Added l2i and lc2i to BUILD_ATTS if not MINIMAL.

4) Added -Dno_llvm_ir to CXX_DEFINES.

5) Added to BUILD_ATTS, flags of form: no_XXX and allow_XXX for each ifdef (i.e.
XXX in {text_asm, dump, llvm_cl, and llvm_ir}).

We also discussed modifying llvm2ice.cpp to check ifdefs and produce the
corresponding set of build attributes, and complain with error if for some XX,
neither allow_XXX or no_XXX is defined. Then modify iffatts to use this. This
will get rid of the corresponding llvm2ice.build_atts file. However, it was much
harder than I initially thought to fix ifatts.py. Hence, I have only implemented
the llvm2ice.cpp changes. Fixing ifatts.py to use the executable for build
attributes will be done in a later CL.

+else
+  BUILD_ATTS := $(BUILD_ATTS) nonminimal p2i l2i lc2i
 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 -----------------------------------------------)
 
@@ skipping 33 matching lines @@
         IceTypeConverter.cpp \
         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
+make_symlink: $(OBJDIR)/llvm2ice $(OBJDIR)/llvm2ice.build_atts
+        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)
+
+clean-all: clean
+        rm -rf build/