From e45c91135ac4e8dbd49fa446ff033dc7e9070c8e Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Tue, 13 Sep 2011 16:05:53 -0700
Subject: [PATCH] Add a compile-stage2-under-perf step to "make perf" target.

---
 mk/perf.mk     | 13 ++++++++++++-
 mk/platform.mk |  2 +-
 mk/stageN.mk   |  4 ++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/mk/perf.mk b/mk/perf.mk
index 9e7ffc6d665..fe5d1e69d5a 100644
--- a/mk/perf.mk
+++ b/mk/perf.mk
@@ -1 +1,12 @@
-perf: check-stage2-perf
+
+ifdef CFG_PERF_TOOL
+rustc-perf$(X): stage2/rustc$(X)
+	@$(call E, perf compile: $@)
+	$(PERF_STAGE1) -L stage2 -o $@ $(COMPILER_CRATE)
+	rm -f $@
+else
+rustc-perf$(X): stage2/rustc$(X)
+	touch $@
+endif
+
+perf: check-stage2-perf rustc-perf$(X)
diff --git a/mk/platform.mk b/mk/platform.mk
index c7cd36331fb..123d2d99bd6 100644
--- a/mk/platform.mk
+++ b/mk/platform.mk
@@ -54,7 +54,7 @@ ifeq ($(CFG_OSTYPE), Linux)
 	  -e sched:sched_switch \
 	  -e fs:do_sys_open \
 	  -i \
-	  -r 10
+	  -r 3
   else
     ifdef CFG_VALGRIND
       CFG_PERF_TOOL :=\
diff --git a/mk/stageN.mk b/mk/stageN.mk
index 171b954d9a7..868ac84e1fe 100644
--- a/mk/stageN.mk
+++ b/mk/stageN.mk
@@ -46,6 +46,10 @@ STAGE$(2) := $$(Q)$$(call CFG_RUN_TARG,stage$(2), \
                 $$(CFG_VALGRIND_COMPILE) stage$(2)/rustc$$(X) \
                 $$(CFG_RUSTC_FLAGS))
 
+PERF_STAGE$(2) := $$(Q)$$(call CFG_RUN_TARG,stage$(2), \
+                $$(CFG_PERF_TOOL) stage$(2)/rustc$$(X) \
+                $$(CFG_RUSTC_FLAGS))
+
 stage$(2)/%.o: stage$(2)/%.s
 	@$$(call E, assemble [gcc]: $$@)
 	$$(Q)gcc $$(CFG_GCCISH_CFLAGS) -o $$@ -c $$<