---

yaml
---
r: 274232
b: refs/heads/stable
c: f2c0ecd
h: refs/heads/master

Author: oli-obk

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 86ffe5d18f0207c89fd9ed25cded844a9d7a0c89
+refs/heads/stable: f2c0ecded5f831eb03c187a2b13f04e959f5e3a3
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/COPYRIGHT

@@ -7,7 +7,7 @@ terms.
 Longer version:
 
 The Rust Project is copyright 2016, The Rust Project
-Developers.
+Developers (given in the file AUTHORS.txt).
 
 Licensed under the Apache License, Version 2.0
 <LICENSE-APACHE or

branches/stable/Makefile.in

@@ -220,12 +220,19 @@ endif
 # The test suite
 ifneq ($(strip $(findstring check,$(MAKECMDGOALS)) \
                $(findstring test,$(MAKECMDGOALS))  \
+               $(findstring perf,$(MAKECMDGOALS))  \
                $(findstring tidy,$(MAKECMDGOALS))),)
   CFG_INFO := $(info cfg: including test rules)
   include $(CFG_SRC_DIR)mk/tests.mk
   include $(CFG_SRC_DIR)mk/grammar.mk
 endif
 
+# Performance and benchmarking
+ifneq ($(findstring perf,$(MAKECMDGOALS)),)
+  CFG_INFO := $(info cfg: including perf rules)
+  include $(CFG_SRC_DIR)mk/perf.mk
+endif
+
 # Copy all the distributables to another directory for binary install
 ifneq ($(strip $(findstring prepare,$(MAKECMDGOALS)) \
                $(findstring dist,$(MAKECMDGOALS)) \

branches/stable/configure

@@ -550,7 +550,7 @@ CFG_SELF="$0"
 CFG_CONFIGURE_ARGS="$@"
 
 
-case "${CFG_SRC_DIR}" in
+case "${CFG_SRC_DIR}" in  
     *\ * )
         err "The path to the rust source directory contains spaces, which is not supported"
         ;;
@@ -892,13 +892,6 @@ then
     CFG_DISABLE_JEMALLOC=1
 fi
 
-if [ $CFG_OSTYPE = pc-windows-gnu ]
-then
-    # FIXME(#31030) - there's not a great reason to disable jemalloc here
-    step_msg "on Windows, disabling jemalloc"
-    CFG_DISABLE_JEMALLOC=1
-fi
-
 # OS X 10.9, gcc is actually clang. This can cause some confusion in the build
 # system, so if we find that gcc is clang, we should just use clang directly.
 if [ $CFG_OSTYPE = apple-darwin -a -z "$CFG_ENABLE_CLANG" ]
@@ -1042,7 +1035,7 @@ then
         if [ -n "$CFG_OSX_CLANG_VERSION" ]
         then
             case $CFG_OSX_CLANG_VERSION in
-                (7.0* | 7.1* | 7.2*)
+                (7.0*)
                 step_msg "found ok version of APPLE CLANG: $CFG_OSX_CLANG_VERSION"
                 ;;
                 (*)
@@ -1051,7 +1044,7 @@ then
             esac
         else
             case $CFG_CLANG_VERSION in
-                (3.2* | 3.3* | 3.4* | 3.5* | 3.6* | 3.7* | 3.8* | 3.9*)
+                (3.2* | 3.3* | 3.4* | 3.5* | 3.6* | 3.7* | 3.8*)
                 step_msg "found ok version of CLANG: $CFG_CLANG_VERSION"
                 ;;
                 (*)
@@ -1361,22 +1354,16 @@ for h in $CFG_HOST
 do
     for t in $CFG_TARGET
     do
-        # host bin dir stage0
-        make_dir $h/stage0/bin
-
         # host lib dir stage0
         make_dir $h/stage0/lib
 
-        # host test dir stage0
-        make_dir $h/stage0/test
-
         # target bin dir stage0
         make_dir $h/stage0/lib/rustlib/$t/bin
 
         # target lib dir stage0
         make_dir $h/stage0/lib/rustlib/$t/lib
 
-        for i in 1 2 3
+        for i in 0 1 2 3
         do
             # host bin dir
             make_dir $h/stage$i/bin

branches/stable/mk/crates.mk

@@ -102,7 +102,7 @@ DEPS_rustc_front := std syntax log serialize
 DEPS_rustc_lint := rustc log syntax
 DEPS_rustc_llvm := native:rustllvm libc std rustc_bitflags
 DEPS_rustc_metadata := rustc rustc_front syntax rbml
-DEPS_rustc_passes := syntax rustc core rustc_front
+DEPS_rustc_passes := syntax rustc core
 DEPS_rustc_mir := rustc rustc_front syntax
 DEPS_rustc_resolve := arena rustc rustc_front log syntax
 DEPS_rustc_platform_intrinsics := rustc rustc_llvm

branches/stable/mk/main.mk

@@ -13,7 +13,7 @@
 ######################################################################
 
 # The version number
-CFG_RELEASE_NUM=1.8.0
+CFG_RELEASE_NUM=1.7.0
 
 # An optional number to put after the label, e.g. '.2' -> '-beta.2'
 # NB Make sure it starts with a dot to conform to semver pre-release
@@ -522,6 +522,14 @@ STAGE$(1)_T_$(2)_H_$(3) := \
 		$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2)) \
                 $$(RUSTC_FLAGS_$(2))
 
+PERF_STAGE$(1)_T_$(2)_H_$(3) := \
+	$$(Q)$$(call CFG_RUN_TARG_$(3),$(1), \
+		$$(CFG_PERF_TOOL) \
+		$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
+		--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \
+		$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2)) \
+                $$(RUSTC_FLAGS_$(2))
+
 endef
 
 $(foreach build,$(CFG_HOST), \

branches/stable/mk/perf.mk

@@ -0,0 +1,25 @@
+# Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
+
+
+ifdef CFG_PERF_TOOL
+rustc-perf$(X): $(CFG_BUILD)/stage2/bin/rustc$(X_$(CFG_BUILD))
+	@$(call E, perf compile: $@)
+	$(PERF_STAGE2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) \
+		 -o $@ $(COMPILER_CRATE) >rustc-perf.err 2>&1
+	$(Q)rm -f $(LIBRUSTC_GLOB)
+else
+rustc-perf$(X): $(CFG_BUILD)/stage2/bin/rustc$(X_$(CFG_BUILD))
+	$(Q)touch $@
+endif
+
+perf: check-stage2-perf rustc-perf$(X_$(CFG_BUILD))
+	$(Q)find $(CFG_BUILD)/test/perf -name \*.err | xargs cat
+	$(Q)cat rustc-perf.err

branches/stable/mk/platform.mk

@@ -77,6 +77,23 @@ define DEF_GOOD_VALGRIND
 endef
 $(foreach t,$(CFG_TARGET),$(eval $(call DEF_GOOD_VALGRIND,$(t))))
 
+ifneq ($(findstring linux,$(CFG_OSTYPE)),)
+  ifdef CFG_PERF
+    ifneq ($(CFG_PERF_WITH_LOGFD),)
+        CFG_PERF_TOOL := $(CFG_PERF) stat -r 3 --log-fd 2
+    else
+        CFG_PERF_TOOL := $(CFG_PERF) stat -r 3
+    endif
+  else
+    ifdef CFG_VALGRIND
+      CFG_PERF_TOOL := \
+        $(CFG_VALGRIND) --tool=cachegrind --cache-sim=yes --branch-sim=yes
+    else
+      CFG_PERF_TOOL := /usr/bin/time --verbose
+    endif
+  endif
+endif
+
 AR := ar
 
 define SET_FROM_CFG

branches/stable/mk/tests.mk

@@ -50,6 +50,11 @@ ifdef CFG_VALGRIND
   CTEST_RUNTOOL = --runtool "$(CFG_VALGRIND)"
 endif
 
+# Arguments to the perf tests
+ifdef CFG_PERF_TOOL
+  CTEST_PERF_RUNTOOL = --runtool "$(CFG_PERF_TOOL)"
+endif
+
 CTEST_TESTARGS := $(TESTARGS)
 
 # --bench is only relevant for crate tests, not for the compile tests
@@ -65,6 +70,12 @@ endif
 # This prevents tests from failing with some locales (fixes #17423).
 export LC_ALL=C
 
+# If we're running perf then set this environment variable
+# to put the benchmarks into 'hard mode'
+ifeq ($(MAKECMDGOALS),perf)
+  export RUST_BENCH=1
+endif
+
 TEST_LOG_FILE=tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).log
 TEST_OK_FILE=tmp/check-stage$(1)-T-$(2)-H-$(3)-$(4).ok
 
@@ -475,6 +486,10 @@ CODEGEN_RS := $(wildcard $(S)src/test/codegen/*.rs)
 CODEGEN_CC := $(wildcard $(S)src/test/codegen/*.cc)
 RUSTDOCCK_RS := $(wildcard $(S)src/test/rustdoc/*.rs)
 
+# perf tests are the same as bench tests only they run under
+# a performance monitor.
+PERF_RS := $(wildcard $(S)src/test/bench/*.rs)
+
 RPASS_TESTS := $(RPASS_RS)
 RPASS_VALGRIND_TESTS := $(RPASS_VALGRIND_RS)
 RPASS_FULL_TESTS := $(RPASS_FULL_RS)
@@ -484,6 +499,7 @@ RFAIL_TESTS := $(RFAIL_RS)
 CFAIL_TESTS := $(CFAIL_RS)
 PFAIL_TESTS := $(PFAIL_RS)
 BENCH_TESTS := $(BENCH_RS)
+PERF_TESTS := $(PERF_RS)
 PRETTY_TESTS := $(PRETTY_RS)
 DEBUGINFO_GDB_TESTS := $(DEBUGINFO_GDB_RS)
 DEBUGINFO_LLDB_TESTS := $(DEBUGINFO_LLDB_RS)
@@ -535,6 +551,11 @@ CTEST_BUILD_BASE_bench = bench
 CTEST_MODE_bench = run-pass
 CTEST_RUNTOOL_bench = $(CTEST_RUNTOOL)
 
+CTEST_SRC_BASE_perf = bench
+CTEST_BUILD_BASE_perf = perf
+CTEST_MODE_perf = run-pass
+CTEST_RUNTOOL_perf = $(CTEST_PERF_RUNTOOL)
+
 CTEST_SRC_BASE_debuginfo-gdb = debuginfo
 CTEST_BUILD_BASE_debuginfo-gdb = debuginfo-gdb
 CTEST_MODE_debuginfo-gdb = debuginfo-gdb
@@ -604,7 +625,7 @@ TEST_SREQ$(1)_T_$(2)_H_$(3) = \
 	$$(HBIN$(1)_H_$(3))/compiletest$$(X_$(3)) \
 	$$(SREQ$(1)_T_$(2)_H_$(3))
 
-# Rules for the cfail/rfail/rpass/bench test runner
+# Rules for the cfail/rfail/rpass/bench/perf test runner
 
 # The tests select when to use debug configuration on their own;
 # remove directive, if present, from CFG_RUSTC_FLAGS (issue #7898).
@@ -668,6 +689,7 @@ CTEST_DEPS_rfail_$(1)-T-$(2)-H-$(3) = $$(RFAIL_TESTS)
 CTEST_DEPS_cfail_$(1)-T-$(2)-H-$(3) = $$(CFAIL_TESTS)
 CTEST_DEPS_pfail_$(1)-T-$(2)-H-$(3) = $$(PFAIL_TESTS)
 CTEST_DEPS_bench_$(1)-T-$(2)-H-$(3) = $$(BENCH_TESTS)
+CTEST_DEPS_perf_$(1)-T-$(2)-H-$(3) = $$(PERF_TESTS)
 CTEST_DEPS_debuginfo-gdb_$(1)-T-$(2)-H-$(3) = $$(DEBUGINFO_GDB_TESTS)
 CTEST_DEPS_debuginfo-lldb_$(1)-T-$(2)-H-$(3) = $$(DEBUGINFO_LLDB_TESTS) \
                                                $(S)src/etc/lldb_batchmode.py \
@@ -739,7 +761,7 @@ endif
 endef
 
 CTEST_NAMES = rpass rpass-valgrind rpass-full rfail-full cfail-full rfail cfail pfail \
-	bench debuginfo-gdb debuginfo-lldb codegen rustdocck
+	bench perf debuginfo-gdb debuginfo-lldb codegen rustdocck
 
 $(foreach host,$(CFG_HOST), \
  $(eval $(foreach target,$(CFG_TARGET), \
@@ -912,6 +934,7 @@ TEST_GROUPS = \
 	cfail \
 	pfail \
 	bench \
+	perf \
 	rmake \
 	rustdocck \
 	debuginfo-gdb \

branches/stable/src/doc/book/bibliography.md

@@ -80,4 +80,3 @@ Language](http://www.cs.indiana.edu/~eholk/papers/hips2013.pdf). Early GPU work
   Rust](http://munksgaard.me/papers/laumann-munksgaard-larsen.pdf). Philip
   Munksgaard's master's thesis. Research for Servo.
 * [Ownership is Theft: Experiences Building an Embedded OS in Rust - Amit Levy, et. al.](http://amitlevy.com/papers/tock-plos2015.pdf)
-* [You can't spell trust without Rust](https://raw.githubusercontent.com/Gankro/thesis/master/thesis.pdf). Alexis Beingessner's master's thesis.