[Test] Adjust type checker performance tests

Author: hborla

validation-test/Sema/type_checker_perf/slow/expression_too_complex_4.swift renamed to validation-test/Sema/type_checker_perf/fast/expression_too_complex_4.swift

@@ -5,5 +5,4 @@ func test(_ i: Int, _ j: Int) -> Int {
   return 1 + (((i >> 1) + (i >> 2) + (i >> 3) + (i >> 4) << 1) << 1) & 0x40 +
          1 + (((i >> 1) + (i >> 2) + (i >> 3) + (i >> 4) << 1) << 1) & 0x40 +
          1 + (((i >> 1) + (i >> 2) + (i >> 3) + (i >> 4) << 1) << 1) & 0x40
-  // expected-error@-1 {{the compiler is unable to type-check this expression in reasonable time}}
 }

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

@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 2 --end 10 --step 2 --select NumConstraintScopes --polynomial-threshold 1.5 %s
+// RUN: %scale-test --begin 2 --end 10 --step 2 --select NumConstraintScopes %s
 // REQUIRES: asserts,no_asan
 
 let empty: [Int] = []

validation-test/Sema/type_checker_perf/slow/rdar22022980.swift renamed to validation-test/Sema/type_checker_perf/fast/rdar22022980.swift

@@ -2,4 +2,3 @@
 // REQUIRES: tools-release,no_asan
 
 _ = [1, 3, 5, 7, 11].filter{ $0 == 1 || $0 == 3 || $0 == 11 || $0 == 1 || $0 == 3 || $0 == 11 } == [ 1, 3, 11 ]
-// expected-error@-1 {{unable to type-check}}

validation-test/Sema/type_checker_perf/slow/rdar23429943.swift renamed to validation-test/Sema/type_checker_perf/fast/rdar23429943.swift

@@ -1,7 +1,6 @@
 // RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1
 // REQUIRES: tools-release,no_asan
 
-// expected-error@+1 {{the compiler is unable to type-check this expression in reasonable time}}
 let _ = [0].reduce([Int]()) {
   return $0.count == 0 && ($1 == 0 || $1 == 2 || $1 == 3) ? [] : $0 + [$1]
 }

validation-test/Sema/type_checker_perf/slow/rdar23682605.swift renamed to validation-test/Sema/type_checker_perf/fast/rdar23682605.swift

@@ -14,7 +14,6 @@ func memoize<T: Hashable, U>( body: @escaping ((T)->U, T)->U ) -> (T)->U {
 }
 
 let fibonacci = memoize {
-  // expected-error@-1 {{reasonable time}}
   fibonacci, n in
   n < 2 ? Double(n) : fibonacci(n - 1) + fibonacci(n - 2)
 }

validation-test/Sema/type_checker_perf/slow/rdar23861629.swift renamed to validation-test/Sema/type_checker_perf/fast/rdar23861629.swift

@@ -5,7 +5,6 @@ struct S { var s: String? }
 
 func rdar23861629(_ a: [S]) {
   _ = a.reduce("") {
-    // expected-error@-1 {{reasonable time}}
     ($0 == "") ? ($1.s ?? "") : ($0 + "," + ($1.s ?? "")) + ($1.s ?? "test") + ($1.s ?? "okay")
   }
 }

validation-test/Sema/type_checker_perf/slow/fast-operator-typechecking.swift

@@ -18,5 +18,4 @@ func f(tail: UInt64, byteCount: UInt64) {
 func size(count: Int) {
   // Size of the buffer we need to allocate
   let _ = count * MemoryLayout<Float>.size * (4 + 3 + 3 + 2 + 4)
-  // expected-error@-1 {{the compiler is unable to type-check this expression in reasonable time}}
 }