---

yaml
---
r: 274164
b: refs/heads/stable
c: 49e27f1
h: refs/heads/master

Author: dirk

[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: d63b8e539ff1605cfe2ea3c1893139bd77e3bb8d
+refs/heads/stable: 49e27f1c5f2415b01101f3c1201ebe9f37b8aaa3
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

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/mk/main.mk

@@ -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/etc/cmathconsts.c

@@ -0,0 +1,103 @@
+// Copyright 2014 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.
+//
+//
+// This is a helper C program for generating required math constants
+//
+// Should only be required when porting to a different target architecture
+// (or c compiler/libmath)
+//
+// Call with <rust machine type of c_float> <rust machine type of c_double>
+// and ensure that libcore/cmath.rs complies to the output
+//
+// Requires a printf that supports "%a" specifiers
+//
+
+#include <float.h>
+#include <math.h>
+#include <stdio.h>
+
+// must match std::ctypes
+
+#define C_FLT(x) (float)x
+#define C_DBL(x) (double)x
+
+int main(int argc, char** argv) {
+  if (argc != 3) {
+    fprintf(stderr, "%s <ctypes::c_float> <ctypes::c_double>\n", argv[0]);
+    return 1;
+  }
+  char* c_flt = argv[1];
+  char* c_dbl = argv[2];
+
+  printf("mod c_float_math_consts {\n");
+  printf("    const pi: c_float = %a_%s;\n", C_FLT(M_PI), c_flt);
+  printf("    const div_1_pi: c_float = %a_%s;\n", C_FLT(M_1_PI), c_flt);
+  printf("    const div_2_pi: c_float = %a_%s;\n", C_FLT(M_2_PI), c_flt);
+  printf("    const div_pi_2: c_float = %a_%s;\n", C_FLT(M_PI_2), c_flt);
+  printf("    const div_pi_4: c_float = %a_%s;\n", C_FLT(M_PI_4), c_flt);
+  printf("    const div_2_sqrtpi: c_float = %a_%s;\n",
+         C_FLT(M_2_SQRTPI), c_flt);
+  printf("    const e: c_float = %a_%s;\n", C_FLT(M_E), c_flt);
+  printf("    const log2_e: c_float = %a_%s;\n", C_FLT(M_LOG2E), c_flt);
+  printf("    const log10_e: c_float = %a_%s;\n", C_FLT(M_LOG10E), c_flt);
+  printf("    const ln_2: c_float = %a_%s;\n",  C_FLT(M_LN2), c_flt);
+  printf("    const ln_10: c_float = %a_%s;\n",  C_FLT(M_LN10), c_flt);
+  printf("    const sqrt2: c_float = %a_%s;\n",  C_FLT(M_SQRT2), c_flt);
+  printf("    const div_1_sqrt2: c_float = %a_%s;\n",
+         C_FLT(M_SQRT1_2), c_flt);
+  printf("}\n\n");
+
+  printf("mod c_double_math_consts {\n");
+  printf("    const pi: c_double = %a_%s;\n", C_DBL(M_PI), c_dbl);
+  printf("    const div_1_pi: c_double = %a_%s;\n", C_DBL(M_1_PI), c_dbl);
+  printf("    const div_2_pi: c_double = %a_%s;\n", C_DBL(M_2_PI), c_dbl);
+  printf("    const div_pi_2: c_double = %a_%s;\n", C_DBL(M_PI_2), c_dbl);
+  printf("    const div_pi_4: c_double = %a_%s;\n", C_DBL(M_PI_4), c_dbl);
+  printf("    const div_2_sqrtpi: c_double = %a_%s;\n",
+         C_DBL(M_2_SQRTPI), c_dbl);
+  printf("    const e: c_double = %a_%s;\n", C_DBL(M_E), c_dbl);
+  printf("    const log2_e: c_double = %a_%s;\n", C_DBL(M_LOG2E), c_dbl);
+  printf("    const log10_e: c_double = %a_%s;\n", C_DBL(M_LOG10E), c_dbl);
+  printf("    const ln_2: c_double = %a_%s;\n", C_DBL(M_LN2), c_dbl);
+  printf("    const ln_10: c_double = %a_%s;\n", C_DBL(M_LN10), c_dbl);
+  printf("    const sqrt2: c_double = %a_%s;\n", C_DBL(M_SQRT2), c_dbl);
+  printf("    const div_1_sqrt2: c_double = %a_%s;\n",
+         C_DBL(M_SQRT1_2), c_dbl);
+  printf("}\n\n");
+
+  printf("mod c_float_targ_consts {\n");
+  printf("    const radix: uint = %uu;\n", FLT_RADIX);
+  printf("    const mantissa_digits: uint = %uu;\n", FLT_MANT_DIG);
+  printf("    const digits: uint = %uu;\n", FLT_DIG);
+  printf("    const min_exp: int = %i;\n", FLT_MIN_EXP);
+  printf("    const max_exp: int = %i;\n", FLT_MAX_EXP);
+  printf("    const min_10_exp: int = %i;\n", FLT_MIN_10_EXP);
+  printf("    const max_10_exp: int = %i;\n", FLT_MAX_10_EXP);
+  printf("    const min_value: c_float = %a_%s;\n", C_FLT(FLT_MIN), c_flt);
+  printf("    const max_value: c_float = %a_%s;\n", C_FLT(FLT_MAX), c_flt);
+  printf("    const epsilon: c_float = %a_%s;\n", C_FLT(FLT_EPSILON), c_flt);
+  printf("}\n\n");
+
+  printf("mod c_double_targ_consts {\n");
+  printf("    const radix: uint = %uu;\n", FLT_RADIX);
+  printf("    const mantissa_digits: uint = %uu;\n", DBL_MANT_DIG);
+  printf("    const digits: uint = %uu;\n", DBL_DIG);
+  printf("    const min_exp: int = %i;\n", DBL_MIN_EXP);
+  printf("    const max_exp: int = %i;\n", DBL_MAX_EXP);
+  printf("    const min_10_exp: int = %i;\n", DBL_MIN_10_EXP);
+  printf("    const max_10_exp: int = %i;\n", DBL_MAX_10_EXP);
+  printf("    const min_value: c_double = %a_%s;\n", C_DBL(DBL_MIN), c_dbl);
+  printf("    const max_value: c_double = %a_%s;\n", C_DBL(DBL_MAX), c_dbl);
+  printf("    const epsilon: c_double = %a_%s;\n", C_DBL(DBL_EPSILON), c_dbl);
+  printf("}\n");
+
+  return 0;
+}