Generate a minimal llvm2ice.

Makefile.standalone

Index: Makefile.standalone
diff --git a/Makefile.standalone b/Makefile.standalone
index cb0082cee3a5914a7151e50d27f8346a3bd03d80..9703b6eebf4823e3d9948556e4b5747f9e0c49ee 100644
--- a/Makefile.standalone
+++ b/Makefile.standalone
@@ -100,12 +100,21 @@ SRCS= \
 
 OBJS=$(patsubst %.cpp, $(OBJDIR)/%.o, $(SRCS))
 
+
+MINOBJDIR=$(OBJDIR)/min
+
+MINOBJS=$(patsubst %.cpp, $(MINOBJDIR)/%.o, $(SRCS))
+
+MIN_CXXFLAGS = -DBUILD_MIN_LLVM

[Jim Stichnoth, 2014/10/13 16:03:58]

LLVM?

Maybe something like SZ_MINIMAL?

[jvoung (off chromium), 2014/10/13 17:05:08]

SHAVED_ICE

just kidding

[Karl, 2014/10/14 22:54:12]

Done.

+
 # Keep all the first target so it's the default.
-all: $(OBJDIR)/llvm2ice make_symlink
+all: $(OBJDIR)/llvm2ice $(MINOBJDIR)/llvm2ice make_symlink
 
-make_symlink: $(OBJDIR)/llvm2ice
+make_symlink: $(OBJDIR)/llvm2ice $(MINOBJDIR)/llvm2ice

[Jim Stichnoth, 2014/10/13 16:03:58]

I'm not thrilled about the build time doubling.  What do you think about
something like this?

- Set OBJDIR, OPTLEVEL, ASSERTIONS, etc. to something appropriate when MINIMAL
is defined.

- Change run-llvm2ice.py to be able to run FileCheck as part of its execution.

- Change the lit RUN lines accordingly.

- In run-llvm2ice.py, probe the llvm2ice binary and if it is a minimal build
that doesn't support requirements of the test (such as using IceConverter), just
return success without running llvm2ice+FileCheck.

[jvoung (off chromium), 2014/10/13 17:05:08]

If it helps, lit's llvm/utils/lit/lit/TestRunner.py has a "REQUIRES: ..."
keyword (besides "RUN" and "XFAIL"). E.g., "REQUIRES: asserts" and "REQUIRES:
fma3".

I'm not sure exactly how that works, but I think it checks a config file which
could be generated. I think it's similar to how they support per-arch
directories which require the particular backend to be configured-in and built.

[Karl, 2014/10/14 22:54:12]

Made code dependent of command-line flag: "MINIMAL=t".

Also modified so that we now generate llvm2ice.build_atts holding the
corresponding build flags used to build llvm2ice. Added two concepts:

1) The REQUIRES lines to assert that defines when the lit test should be run.
and
2) A conditional %ifX command prefix to only run commands if the corresponding
built attributes are defined. In this case, the lit file  should contain tests
for multiple builds that use the same input. Tests that don't meet the build
conditions quietly succeed by doing nothing.
 

 	rm -f llvm2ice
 	ln -s $(OBJDIR)/llvm2ice
+	rm -f minllvm2ice
+	ln -s $(MINOBJDIR)/llvm2ice minllvm2ice
 
 .PHONY: all make_symlink
 
@@ -122,6 +131,18 @@ $(OBJS): | $(OBJDIR)
 $(OBJDIR):
 	@mkdir -p $@
 
+$(MINOBJDIR)/llvm2ice: $(MINOBJS)
+	$(CXX) $(MIN_CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LLVM_LDFLAGS) -ldl \
+               -Wl,-rpath=$(abspath $(LIBCXX_INSTALL_PATH)/lib)
+
+$(MINOBJS): $(MINOBJDIR)/%.o: src/%.cpp src/*.h src/*.def
+	$(CXX) -c $(MIN_CXXFLAGS) $(CXXFLAGS) $< -o $@
+
+$(MINOBJS): | $(MINOBJDIR)
+
+$(MINOBJDIR): $(OBJDIR)
+	@mkdir -p $@
+
 check-lit: llvm2ice make_symlink
 	LLVM_BIN_PATH=$(LLVM_BIN_PATH) \
 	$(LLVM_SRC_PATH)/utils/lit/lit.py -sv tests_lit
@@ -149,4 +170,4 @@ format-diff:
 	$(CLANG_FORMAT_DIFF) -p1 -style=LLVM -i
 
 clean:
-	rm -rf llvm2ice *.o build/
+	rm -rf llvm2ice minllvm2ice *.o build/