@@ -50,11 +50,6 @@ ifdef CFG_VALGRIND
50
50
CTEST_RUNTOOL = --runtool "$(CFG_VALGRIND ) "
51
51
endif
52
52
53
- # Arguments to the perf tests
54
- ifdef CFG_PERF_TOOL
55
- CTEST_PERF_RUNTOOL = --runtool "$(CFG_PERF_TOOL ) "
56
- endif
57
-
58
53
CTEST_TESTARGS := $(TESTARGS )
59
54
60
55
# --bench is only relevant for crate tests, not for the compile tests
70
65
# This prevents tests from failing with some locales (fixes #17423).
71
66
export LC_ALL =C
72
67
73
- # If we're running perf then set this environment variable
74
- # to put the benchmarks into 'hard mode'
75
- ifeq ($(MAKECMDGOALS ) ,perf)
76
- export RUST_BENCH =1
77
- endif
78
-
79
68
TEST_LOG_FILE =tmp/check-stage$(1 ) -T-$(2 ) -H-$(3 ) -$(4 ) .log
80
69
TEST_OK_FILE =tmp/check-stage$(1 ) -T-$(2 ) -H-$(3 ) -$(4 ) .ok
81
70
@@ -486,10 +475,6 @@ CODEGEN_RS := $(wildcard $(S)src/test/codegen/*.rs)
486
475
CODEGEN_CC := $(wildcard $(S ) src/test/codegen/* .cc)
487
476
RUSTDOCCK_RS := $(wildcard $(S ) src/test/rustdoc/* .rs)
488
477
489
- # perf tests are the same as bench tests only they run under
490
- # a performance monitor.
491
- PERF_RS := $(wildcard $(S ) src/test/bench/* .rs)
492
-
493
478
RPASS_TESTS := $(RPASS_RS )
494
479
RPASS_VALGRIND_TESTS := $(RPASS_VALGRIND_RS )
495
480
RPASS_FULL_TESTS := $(RPASS_FULL_RS )
@@ -499,7 +484,6 @@ RFAIL_TESTS := $(RFAIL_RS)
499
484
CFAIL_TESTS := $(CFAIL_RS )
500
485
PFAIL_TESTS := $(PFAIL_RS )
501
486
BENCH_TESTS := $(BENCH_RS )
502
- PERF_TESTS := $(PERF_RS )
503
487
PRETTY_TESTS := $(PRETTY_RS )
504
488
DEBUGINFO_GDB_TESTS := $(DEBUGINFO_GDB_RS )
505
489
DEBUGINFO_LLDB_TESTS := $(DEBUGINFO_LLDB_RS )
@@ -551,11 +535,6 @@ CTEST_BUILD_BASE_bench = bench
551
535
CTEST_MODE_bench = run-pass
552
536
CTEST_RUNTOOL_bench = $(CTEST_RUNTOOL )
553
537
554
- CTEST_SRC_BASE_perf = bench
555
- CTEST_BUILD_BASE_perf = perf
556
- CTEST_MODE_perf = run-pass
557
- CTEST_RUNTOOL_perf = $(CTEST_PERF_RUNTOOL )
558
-
559
538
CTEST_SRC_BASE_debuginfo-gdb = debuginfo
560
539
CTEST_BUILD_BASE_debuginfo-gdb = debuginfo-gdb
561
540
CTEST_MODE_debuginfo-gdb = debuginfo-gdb
@@ -625,7 +604,7 @@ TEST_SREQ$(1)_T_$(2)_H_$(3) = \
625
604
$$(HBIN$(1 ) _H_$(3 ) ) /compiletest$$(X_$(3 ) ) \
626
605
$$(SREQ$(1 ) _T_$(2 ) _H_$(3 ) )
627
606
628
- # Rules for the cfail/rfail/rpass/bench/perf test runner
607
+ # Rules for the cfail/rfail/rpass/bench test runner
629
608
630
609
# The tests select when to use debug configuration on their own;
631
610
# remove directive, if present, from CFG_RUSTC_FLAGS (issue #7898).
@@ -689,7 +668,6 @@ CTEST_DEPS_rfail_$(1)-T-$(2)-H-$(3) = $$(RFAIL_TESTS)
689
668
CTEST_DEPS_cfail_$(1 ) -T-$(2 ) -H-$(3 ) = $$(CFAIL_TESTS )
690
669
CTEST_DEPS_pfail_$(1 ) -T-$(2 ) -H-$(3 ) = $$(PFAIL_TESTS )
691
670
CTEST_DEPS_bench_$(1 ) -T-$(2 ) -H-$(3 ) = $$(BENCH_TESTS )
692
- CTEST_DEPS_perf_$(1 ) -T-$(2 ) -H-$(3 ) = $$(PERF_TESTS )
693
671
CTEST_DEPS_debuginfo-gdb_$(1 ) -T-$(2 ) -H-$(3 ) = $$(DEBUGINFO_GDB_TESTS )
694
672
CTEST_DEPS_debuginfo-lldb_$(1 ) -T-$(2 ) -H-$(3 ) = $$(DEBUGINFO_LLDB_TESTS ) \
695
673
$(S ) src/etc/lldb_batchmode.py \
@@ -761,7 +739,7 @@ endif
761
739
endef
762
740
763
741
CTEST_NAMES = rpass rpass-valgrind rpass-full rfail-full cfail-full rfail cfail pfail \
764
- bench perf debuginfo-gdb debuginfo-lldb codegen rustdocck
742
+ bench debuginfo-gdb debuginfo-lldb codegen rustdocck
765
743
766
744
$(foreach host,$(CFG_HOST), \
767
745
$(eval $(foreach target,$(CFG_TARGET), \
@@ -934,7 +912,6 @@ TEST_GROUPS = \
934
912
cfail \
935
913
pfail \
936
914
bench \
937
- perf \
938
915
rmake \
939
916
rustdocck \
940
917
debuginfo-gdb \
0 commit comments