Merge pull request #6664 from slavapestov/scale-tests-fixes

Scale tests fixes

Author: slavapestov

lib/Sema/CSSolver.cpp

@@ -28,19 +28,18 @@ using namespace constraints;
 // Constraint solver statistics
 //===----------------------------------------------------------------------===//
 #define DEBUG_TYPE "Constraint solver overall"
-#define JOIN(X,Y) JOIN2(X,Y)
 #define JOIN2(X,Y) X##Y
 STATISTIC(NumSolutionAttempts, "# of solution attempts");
 STATISTIC(TotalNumTypeVariables, "# of type variables created");
 
 #define CS_STATISTIC(Name, Description) \
-  STATISTIC(JOIN2(Overall,Name), Description);
+  STATISTIC(Overall##Name, Description);
 #include "ConstraintSolverStats.def"
 
 #undef DEBUG_TYPE
 #define DEBUG_TYPE "Constraint solver largest system"
 #define CS_STATISTIC(Name, Description) \
-  STATISTIC(JOIN2(Largest,Name), Description);
+  STATISTIC(Largest##Name, Description);
 #include "ConstraintSolverStats.def"
 STATISTIC(LargestSolutionAttemptNumber, "# of the largest solution attempt");
 

utils/scale-test

@@ -68,7 +68,7 @@ def run_once_with_primary(args, ast, rng, primary_idx):
 
         mode = "-c"
         if args.typecheck:
-            mode = "-typechec"
+            mode = "-typecheck"
 
         focus = ["-primary-file", primary]
         if args.whole_module_optimization:

validation-test/compiler_scale/callee_analysis_invalidation.gyb

@@ -1,5 +1,5 @@
 // RUN: %scale-test -O --threshold 0.2 --begin 20 --end 25 --step 1 --select computeMethodCallees %s
-// REQUIRES: OS=macosx, tools-release, assertions
+// REQUIRES: OS=macosx
 
 class C0<T:Integer> {
     func foo() {

validation-test/compiler_scale/scale_neighbouring_getset.gyb

@@ -1,5 +1,5 @@
 // RUN: %scale-test --sum-multi --typecheck --begin 5 --end 16 --step 5 --select typeCheckAbstractFunctionBody %s
-// REQUIRES: OS=macosx, tools-release, assertions
+// REQUIRES: OS=macosx
 
 struct Struct${N} {
 % if int(N) > 1: