swiftlang · rudkx · Oct 19, 2018 · Oct 16, 2018 · Oct 18, 2018
diff --git a/include/swift/Basic/Statistic.h b/include/swift/Basic/Statistic.h
@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information

diff --git a/include/swift/Basic/Statistics.def b/include/swift/Basic/Statistics.def
@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information
@@ -158,6 +158,15 @@ FRONTEND_STATISTIC(Sema, NumConformancesDeserialized)
 /// expression typechecker did".
 FRONTEND_STATISTIC(Sema, NumConstraintScopes)
 
+/// Number of constraint-solving scopes that were created but which
+/// did not themselves lead to the creation of further scopes, either
+/// because we successfully found a solution, or some constraint failed.
+///
+/// Note: This can vary based on the number of connected components we
+/// generate, since each connected component will itself have at least
+/// one leaf scope.
+FRONTEND_STATISTIC(Sema, NumLeafScopes)
+
 /// Number of constraints considered per attempt to
 /// contract constraint graph edges.
 /// This is a measure of complexity of the contraction algorithm.

diff --git a/lib/Sema/CSSolver.cpp b/lib/Sema/CSSolver.cpp
@@ -1240,7 +1240,6 @@ bool ConstraintSystem::solve(Expr *const expr,
     auto &log = getASTContext().TypeCheckerDebug->getStream();
     log << "---Solver statistics---\n";
     log << "Total number of scopes explored: " << solverState->NumStatesExplored << "\n";
-    log << "Number of leaf scopes explored: " << solverState->leafScopes << "\n";
     log << "Maximum depth reached while exploring solutions: " << solverState->maxDepth << "\n";
     if (Timer) {
       auto timeInMillis =

diff --git a/lib/Sema/CSStep.h b/lib/Sema/CSStep.h
@@ -395,7 +395,7 @@ class ComponentStep final : public SolverStep {
 
     ComponentScope = llvm::make_unique<Scope>(*this);
     // If this component has oprhaned constraint attached,
-    // let's return it ot the graph.
+    // let's return it to the graph.
     CS.CG.setOrphanedConstraint(OrphanedConstraint);
   }
 };

diff --git a/lib/Sema/ConstraintSystem.cpp b/lib/Sema/ConstraintSystem.cpp
@@ -83,13 +83,17 @@ ConstraintSystem::~ConstraintSystem() {
 }
 
 void ConstraintSystem::incrementScopeCounter() {
-  SWIFT_FUNC_STAT;
   CountScopes++;
   // FIXME: (transitional) increment the redundant "always-on" counter.
   if (TC.Context.Stats)
     TC.Context.Stats->getFrontendCounters().NumConstraintScopes++;
 }
 
+void ConstraintSystem::incrementLeafScopes() {
+  if (TC.Context.Stats)
+    TC.Context.Stats->getFrontendCounters().NumLeafScopes++;
+}
+
 bool ConstraintSystem::hasFreeTypeVariables() {
   // Look for any free type variables.
   for (auto tv : TypeVariables) {

diff --git a/lib/Sema/ConstraintSystem.h b/lib/Sema/ConstraintSystem.h
@@ -1166,12 +1166,6 @@ class ConstraintSystem {
     /// \brief Maximum depth reached so far in exploring solutions.
     unsigned maxDepth = 0;
 
-    /// \brief Count of the number of leaf scopes we've created. These
-    /// either result in a failure to solve, or in a solution, unlike
-    /// all the intermediate scopes. They are interesting to track as
-    /// part of a metric of whether an expression is too complex.
-    unsigned leafScopes = 0;
-
     /// \brief Whether to record failures or not.
     bool recordFixes = false;
 
@@ -1268,7 +1262,7 @@ class ConstraintSystem {
 
       unsigned countScopesExplored = NumStatesExplored - scope->scopeNumber;
       if (countScopesExplored == 1)
-        ++leafScopes;
+        CS.incrementLeafScopes();
 
       SolverScope *savedScope;
       // The position of last retired constraint before given scope.
@@ -1438,6 +1432,7 @@ class ConstraintSystem {
   }
 
   void incrementScopeCounter();
+  void incrementLeafScopes();
 
 public:
   /// \brief Introduces a new solver scope, which any changes to the

diff --git a/validation-test/Sema/type_checker_perf/fast/array_of_tuples.swift.gyb b/validation-test/Sema/type_checker_perf/fast/array_of_tuples.swift.gyb
@@ -0,0 +1,9 @@
+// RUN: %scale-test --begin 1 --end 20 --step 1 --select NumLeafScopes %s
+// REQUIRES: OS=macosx
+// REQUIRES: asserts
+
+let a = [
+%for i in range(0, N):
+  (1, 1),
+%end
+]
diff --git a/validation-test/Sema/type_checker_perf/fast/more_specialized_generic_func.swift.gyb b/validation-test/Sema/type_checker_perf/fast/more_specialized_generic_func.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 8 --end 40 --step 2 --select incrementScopeCounter %s --expected-exit-code 0
+// RUN: %scale-test --begin 8 --end 40 --step 2 --select NumLeafScopes %s --expected-exit-code 0
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar18360240.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar18360240.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 10 --step 2 --select incrementScopeCounter --polynomial-threshold 1.5 %s
+// RUN: %scale-test --begin 2 --end 10 --step 2 --select NumConstraintScopes --polynomial-threshold 1.5 %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar18699199.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar18699199.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 10 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 1 --end 10 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 public enum E

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar18724501.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar18724501.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 5 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 1 --end 5 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar19181998.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar19181998.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 30 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 1 --end 30 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar19181998_nominals.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar19181998_nominals.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 30 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 1 --end 30 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar19394804.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar19394804.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 10 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 1 --end 10 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar19738292.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar19738292.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 7 --end 12 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 7 --end 12 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 // REQUIRES: rdar42650365

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar19777895.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar19777895.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 3 --end 7 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 3 --end 7 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar19915443.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar19915443.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 7 --end 15 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 7 --end 15 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 let a = [0]

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar20233198_any.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar20233198_any.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 6 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar20233198_explicit_overloads.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar20233198_explicit_overloads.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 6 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar20233198_named.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar20233198_named.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 6 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar20233198_typed.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar20233198_typed.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 6 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar20233198_weak.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar20233198_weak.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 6 --step 1 --select incrementScopeCounter %s -Xfrontend=-verify
+// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s -Xfrontend=-verify
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar21070413.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar21070413.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 5 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 1 --end 5 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar21328584.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar21328584.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 5 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 1 --end 5 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar21720888.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar21720888.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 10 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 1 --end 10 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar21930551.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar21930551.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 6 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar22532650.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar22532650.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 10 --end 15 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 10 --end 15 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar22626740.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar22626740.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 7 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 2 --end 7 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar22810685.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar22810685.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 5 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 1 --end 5 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar22836718.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar22836718.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 5 --end 10 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 5 --end 10 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar23327871.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar23327871.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 8 --end 16 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 8 --end 16 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar25866240.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar25866240.swift.gyb
@@ -1,11 +1,12 @@
-// RUN: %scale-test --begin 2 --end 10 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 2 --end 10 --step 1 --select NumConstraintScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
-func f() {
-% for i in range(N):
-  let collection${i} = [String]()
-% end
-
+func f(
+%for i in range(N):
+  collection${i}: [String],
+%end
+  collection${N+1}: [String]
+) {
   _ = ${' + '.join("collection%s" % i for i in range(N))}
 }
diff --git a/validation-test/Sema/type_checker_perf/fast/rdar26939465.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar26939465.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 7 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 2 --end 7 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar29025667.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar29025667.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 7 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 2 --end 7 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar30213053.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar30213053.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 3 --end 7 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 3 --end 7 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar30389602.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar30389602.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 7 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 2 --end 7 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar30729643.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar30729643.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 15 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 1 --end 15 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar31563957.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar31563957.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 5 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 1 --end 5 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar32999041.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar32999041.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 3 --end 8 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 3 --end 8 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 // FIXME: https://bugs.swift.org/browse/SR-6997

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar33292740.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar33292740.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 10 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 2 --end 10 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/fast/rdar40344044.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar40344044.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 3 --end 20  --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 3 --end 20  --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/slow/array_of_tuples.swift.gyb b/validation-test/Sema/type_checker_perf/slow/array_of_tuples.swift.gyb
diff --git a/validation-test/Sema/type_checker_perf/slow/nil_coalescing.swift.gyb b/validation-test/Sema/type_checker_perf/slow/nil_coalescing.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --invert-result --begin 1 --end 5 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --invert-result --begin 1 --end 5 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 // REQUIRES: rdar38963783

diff --git a/validation-test/Sema/type_checker_perf/slow/rdar20818064.swift.gyb b/validation-test/Sema/type_checker_perf/slow/rdar20818064.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --invert-result --begin 1 --end 5 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --invert-result --begin 1 --end 5 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/slow/rdar20959612.swift.gyb b/validation-test/Sema/type_checker_perf/slow/rdar20959612.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --invert-result --begin 3 --end 7 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --invert-result --begin 3 --end 7 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/slow/rdar21198787.swift.gyb b/validation-test/Sema/type_checker_perf/slow/rdar21198787.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --invert-result --begin 1 --end 5 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --invert-result --begin 1 --end 10 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/slow/rdar24543332.swift.gyb b/validation-test/Sema/type_checker_perf/slow/rdar24543332.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --invert-result --begin 1 --end 5 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --invert-result --begin 5 --end 20 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/slow/rdar27585838.swift.gyb b/validation-test/Sema/type_checker_perf/slow/rdar27585838.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 5 --step 1 --select incrementScopeCounter %s --polynomial-threshold=1.7
+// RUN: %scale-test --begin 1 --end 5 --step 1 --select NumLeafScopes %s --polynomial-threshold=1.7
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/slow/rdar30596744_1.swift.gyb b/validation-test/Sema/type_checker_perf/slow/rdar30596744_1.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --invert-result --begin 1 --end 5 --step 1 --select incrementScopeCounter %s --expected-exit-code 1
+// RUN: %scale-test --invert-result --begin 1 --end 5 --step 1 --select NumLeafScopes %s --expected-exit-code 1
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/slow/rdar30596744_2.swift.gyb b/validation-test/Sema/type_checker_perf/slow/rdar30596744_2.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --invert-result --begin 1 --end 5 --step 1 --select incrementScopeCounter %s --expected-exit-code 1
+// RUN: %scale-test --invert-result --begin 1 --end 5 --step 1 --select NumLeafScopes %s --expected-exit-code 1
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/slow/rdar30606089.swift.gyb b/validation-test/Sema/type_checker_perf/slow/rdar30606089.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 5 --step 1 --select incrementScopeCounter %s --polynomial-threshold 1.7
+// RUN: %scale-test --begin 1 --end 5 --step 1 --select NumLeafScopes %s --polynomial-threshold 1.7
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

diff --git a/validation-test/Sema/type_checker_perf/slow/rdar33289839.swift.gyb b/validation-test/Sema/type_checker_perf/slow/rdar33289839.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --invert-result --begin 2 --end 6 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --invert-result --begin 2 --end 6 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 // REQUIRES: rdar42969824