[ConstraintSystem] Rework new constraint stat as a FRONTEND_STATISTIC.

In the process, remove the old incrementScopeCounter SWIFT_FUNC_STAT.

Author: rudkx

include/swift/Basic/Statistic.h

@@ -28,13 +28,6 @@
     ++FStat;                                                            \
   } while (0)
 
-#define SWIFT_FUNC_STAT_INCREMENT(x)                                    \
-  do {                                                                  \
-    static llvm::Statistic FStat =                                      \
-      {DEBUG_TYPE, __func__, __func__, {0}, {false}};                   \
-    FStat += (x);                                                       \
-  } while (0)
-
 // Helper class designed to consolidate reporting of LLVM statistics and timers
 // across swift compilations that typically invoke many drivers, each running
 // many frontends. Additionally collects some cheap "always-on" statistics,

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.

lib/Sema/CSStep.cpp

@@ -76,12 +76,6 @@ StepResult SplitterStep::resume(bool prevFailed) {
   for (auto &component : Components)
     workList.splice(workList.end(), component);
 
-  // We want to compute the number of leaf scopes as if the system had
-  // not been split, so allow each additional component after the
-  // first to have a free leaf scope that doesn't count against the
-  // total for the system.
-  CS.decrementLeafScopes(Components.size() - 1);
-
   // If we came back to this step and previous (one of the components)
   // failed, it means that we can't solve this step either.
   if (prevFailed)

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);
   }
 };

lib/Sema/ConstraintSystem.cpp

@@ -83,24 +83,15 @@ 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::numLeafScopes(unsigned value) {
-  // NOTE: We rely on 2's complement addition here.
-  SWIFT_FUNC_STAT_INCREMENT(value);
-}
-
-void ConstraintSystem::incrementLeafScopes(unsigned increment) {
-  numLeafScopes(increment);
-}
-
-void ConstraintSystem::decrementLeafScopes(unsigned decrement) {
-  numLeafScopes(-decrement);
+void ConstraintSystem::incrementLeafScopes() {
+  if (TC.Context.Stats)
+    TC.Context.Stats->getFrontendCounters().NumLeafScopes++;
 }
 
 bool ConstraintSystem::hasFreeTypeVariables() {

lib/Sema/ConstraintSystem.h

@@ -1432,10 +1432,7 @@ class ConstraintSystem {
   }
 
   void incrementScopeCounter();
-
-  void numLeafScopes(unsigned adjustment);
-  void incrementLeafScopes(unsigned increment =1);
-  void decrementLeafScopes(unsigned decrement =1);
+  void incrementLeafScopes();
 
 public:
   /// \brief Introduces a new solver scope, which any changes to the

validation-test/Sema/type_checker_perf/fast/array_of_tuples.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 20 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 1 --end 20 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

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 numLeafScopes %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
 

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
 

validation-test/Sema/type_checker_perf/fast/rdar18699199.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 10 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 1 --end 10 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 public enum E

validation-test/Sema/type_checker_perf/fast/rdar18724501.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 5 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 1 --end 5 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/fast/rdar19181998.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 30 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 1 --end 30 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

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 numLeafScopes %s
+// RUN: %scale-test --begin 1 --end 30 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/fast/rdar19394804.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 10 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 1 --end 10 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/fast/rdar19738292.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 7 --end 12 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 7 --end 12 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 // REQUIRES: rdar42650365

validation-test/Sema/type_checker_perf/fast/rdar19777895.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 3 --end 7 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 3 --end 7 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/fast/rdar19915443.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 7 --end 15 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 7 --end 15 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 let a = [0]

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 numLeafScopes %s
+// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

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 numLeafScopes %s
+// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

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 numLeafScopes %s
+// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

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 numLeafScopes %s
+// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

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 numLeafScopes %s -Xfrontend=-verify
+// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s -Xfrontend=-verify
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/fast/rdar21070413.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 5 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 1 --end 5 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/fast/rdar21328584.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 5 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 1 --end 5 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/fast/rdar21720888.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 10 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 1 --end 10 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/fast/rdar21930551.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 6 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 2 --end 6 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/fast/rdar22532650.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 10 --end 15 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 10 --end 15 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/fast/rdar22626740.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 7 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 2 --end 7 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/fast/rdar22810685.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 5 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 1 --end 5 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/fast/rdar22836718.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 5 --end 10 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 5 --end 10 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/fast/rdar23327871.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 16 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 8 --end 16 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/fast/rdar25866240.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 NumConstraintScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/fast/rdar26939465.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 7 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 2 --end 7 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/fast/rdar29025667.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 7 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 2 --end 7 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/fast/rdar30213053.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 3 --end 7 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 3 --end 7 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/fast/rdar30389602.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 7 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 2 --end 7 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/fast/rdar30729643.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 15 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 1 --end 15 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/fast/rdar31563957.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 5 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 1 --end 5 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/fast/rdar32999041.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 3 --end 8 --step 1 --select numLeafScopes %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

validation-test/Sema/type_checker_perf/fast/rdar33292740.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 10 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 2 --end 10 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/fast/rdar40344044.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 3 --end 20  --step 1 --select numLeafScopes %s
+// RUN: %scale-test --begin 3 --end 20  --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

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 numLeafScopes %s
+// RUN: %scale-test --invert-result --begin 1 --end 5 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 // REQUIRES: rdar38963783

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 numLeafScopes %s
+// RUN: %scale-test --invert-result --begin 1 --end 5 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

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 numLeafScopes %s
+// RUN: %scale-test --invert-result --begin 3 --end 7 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/slow/rdar21198787.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --invert-result --begin 1 --end 10 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --invert-result --begin 1 --end 10 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/slow/rdar24543332.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --invert-result --begin 5 --end 20 --step 1 --select numLeafScopes %s
+// RUN: %scale-test --invert-result --begin 5 --end 20 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/slow/rdar27585838.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 5 --step 1 --select numLeafScopes %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
 

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 numLeafScopes %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
 

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 numLeafScopes %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
 

validation-test/Sema/type_checker_perf/slow/rdar30606089.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 1 --end 5 --step 1 --select numLeafScopes %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
 

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 numLeafScopes %s
+// RUN: %scale-test --invert-result --begin 2 --end 6 --step 1 --select NumLeafScopes %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 // REQUIRES: rdar42969824