[vmkit-commits] [vmkit] r199668 - Better management of parallelism during compilation. Add a mmtk lowering pass (which is currently empty).

[Gael Thomas]

Author: gthomas
Date: Mon Jan 20 09:57:12 2014
New Revision: 199668

URL: http://llvm.org/viewvc/llvm-project?rev=199668&view=rev
Log:
Better management of parallelism during compilation. Add a mmtk lowering pass (which is currently empty).

Removed:
    vmkit/branches/mcjit/tools/Makefile
Modified:
    vmkit/branches/mcjit/Makefile.rules
    vmkit/branches/mcjit/lib/Makefile
    vmkit/branches/mcjit/lib/j3/Makefile
    vmkit/branches/mcjit/lib/mmtk/Makefile

Modified: vmkit/branches/mcjit/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/Makefile.rules?rev=199668&r1=199667&r2=199668&view=diff
==============================================================================
--- vmkit/branches/mcjit/Makefile.rules (original)
+++ vmkit/branches/mcjit/Makefile.rules Mon Jan 20 09:57:12 2014
@@ -60,7 +60,7 @@ SHFLAGS=-lpthread -ldl -lz -lncurses -fr
 ###############################################################################
 #   Targets
 ###############################################################################
-.PHONY: all all-recursive clean clean-recursive clean-local tidy confclean check
+.PHONY: all all-parallel-recursive clean clean-parallel-recursive clean-local tidy confclean check
 .SECONDARY:
 .SUFFIXES:
 
@@ -69,8 +69,8 @@ SHFLAGS=-lpthread -ldl -lz -lncurses -fr
 ###############################################################################
 RECURSIVE_TARGETS=all clean
 
-define do_sub_target
-$1-recursive::
+define do_parallel_subdirs
+$1-parallel-recursive::
   #$(Echo) "Entering directory $$(PROF)/$2"
 	$(Verb) +$(MAKE) $(SUB_OPT) -C $2 $1 PROF=$(PROF)/$2; \
 		if [ $$$$? != 0 ]; then echo "$$(EchoMsg) abort with errors in $$(PROF)/$2"; exit 1; fi
@@ -78,11 +78,18 @@ endef
 
 define do_recursive_target
 $1:
-	 $(Verb) +$(MAKE) $(SUB_OPT) $1-recursive 
-	 $(Verb) +$(MAKE) $1-local
-$1-recursive::
+	$(Verb) for f in $$(DIRS); do \
+					$(MAKE) $(SUB_OPT) -C $$$$f $1 PROF=$(PROF)/$$$$f; \
+							if [ $$$$? != 0 ]; then echo "$$(EchoMsg) abort with errors in $$(PROF)/$$$$f"; exit 1; fi; \
+					done
+	$(Verb) +$(MAKE) -s $1-parallel-recursive
+
+$1-parallel-recursive::
+	$(Verb) +$(MAKE) -s $1-local
+
 $1-local::
-$$(foreach dir,$$(DIRS),$$(eval $$(call do_sub_target,$1,$$(dir))))
+
+$$(foreach dir,$$(PARALLEL_DIRS),$$(eval $$(call do_parallel_subdirs,$1,$$(dir))))
 endef
 
 $(foreach target,$(RECURSIVE_TARGETS),$(eval $(call do_recursive_target,$(target))))

Modified: vmkit/branches/mcjit/lib/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/Makefile?rev=199668&r1=199667&r2=199668&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/Makefile (original)
+++ vmkit/branches/mcjit/lib/Makefile Mon Jan 20 09:57:12 2014
@@ -5,6 +5,6 @@
 
 LEVEL := ..
 
-DIRS := vmkit j3
+PARALLEL_DIRS := vmkit j3
 
 include $(LEVEL)/Makefile.rules

Modified: vmkit/branches/mcjit/lib/j3/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/Makefile?rev=199668&r1=199667&r2=199668&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/Makefile (original)
+++ vmkit/branches/mcjit/lib/j3/Makefile Mon Jan 20 09:57:12 2014
@@ -5,6 +5,6 @@
 
 LEVEL := ../..
 
-DIRS := vm openjdk
+PARALLEL_DIRS := vm openjdk
 
 include $(LEVEL)/Makefile.rules

Modified: vmkit/branches/mcjit/lib/mmtk/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/mmtk/Makefile?rev=199668&r1=199667&r2=199668&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/mmtk/Makefile (original)
+++ vmkit/branches/mcjit/lib/mmtk/Makefile Mon Jan 20 09:57:12 2014
@@ -5,7 +5,7 @@
 
 LEVEL := ../..
 
-DIRS:=magic
+PARALLEL_DIRS:=magic
 
 BASE_OBJ_FILES=mmtk-lowered
 MODULE=mmtk

Removed: vmkit/branches/mcjit/tools/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/tools/Makefile?rev=199667&view=auto
==============================================================================
--- vmkit/branches/mcjit/tools/Makefile (original)
+++ vmkit/branches/mcjit/tools/Makefile (removed)
@@ -1,10 +0,0 @@
-#===- ./Makefile -------------------------------------------*- Makefile -*--===#
-# 
-#                     The vmkit project
-#===------------------------------------------------------------------------===#
-
-LEVEL := ..
-
-DIRS := j3
-
-include $(LEVEL)/Makefile.rules