tests: make some test more robust for optimizer changes.

This is in preparation for COW support. More optimizer tests require an optimized non-assert stdlib build.

Author: eeckstein

test/Driver/opt-remark.swift

@@ -3,6 +3,8 @@
 // RUN: %target-swiftc_driver -O -Rpass=sil-inliner %s -o %t/throwaway 2>&1 | %FileCheck -check-prefix=REMARK_PASSED %s
 // RUN: %target-swiftc_driver -O -Rpass-missed=sil-inliner %s -o %t/throwaway 2>&1 | %FileCheck -check-prefix=REMARK_MISSED %s
 
+// REQUIRES: swift_stdlib_no_asserts,optimized_stdlib
+
 // DEFAULT-NOT: remark:
 
 func big() {
@@ -39,11 +41,11 @@ func small() {
 
 func foo() {
   // REMARK_MISSED-NOT: remark: {{.*}} inlined
-  // REMARK_MISSED: opt-remark.swift:44:2: remark: Not profitable to inline function "throwaway.big()" (cost = {{.*}}, benefit = {{.*}})
+  // REMARK_MISSED: opt-remark.swift:46:2: remark: Not profitable to inline function "throwaway.big()" (cost = {{.*}}, benefit = {{.*}})
   // REMARK_MISSED-NOT: remark: {{.*}} inlined
 	big()
   // REMARK_PASSED-NOT: remark: Not profitable
-  // REMARK_PASSED: opt-remark.swift:48:3: remark: "throwaway.small()" inlined into "throwaway.foo()" (cost = {{.*}}, benefit = {{.*}})
+  // REMARK_PASSED: opt-remark.swift:50:3: remark: "throwaway.small()" inlined into "throwaway.foo()" (cost = {{.*}}, benefit = {{.*}})
   // REMARK_PASSED-NOT: remark: Not profitable
   small()
 }

test/IRGen/multithread_module.swift

@@ -9,6 +9,7 @@
 // RUN: %target-codesign %t/a.out
 // RUN: %target-run %t/a.out | %FileCheck %s
 // REQUIRES: executable_test
+// REQUIRES: optimized_stdlib,swift_stdlib_no_asserts
 
 
 // Test compilation of a module in multi-threaded compilation.

test/IRGen/objc_protocol_extended_method_types.swift

@@ -5,6 +5,9 @@
 
 // REQUIRES: OS=macosx
 // REQUIRES: objc_interop
+// TODO: fix test for unoptimized stdlib with asserts
+// REQUIRES: swift_stdlib_no_asserts,optimized_stdlib
+
 
 import Foundation
 

test/SILOptimizer/generic_specialization_loops_detection_with_loops.swift

@@ -1,5 +1,7 @@
 // RUN: %target-swift-frontend -O -emit-sil -enforce-exclusivity=unchecked -Xllvm -sil-print-generic-specialization-loops -Xllvm -sil-print-generic-specialization-info %s 2>&1 | %FileCheck --check-prefix=CHECK %s
 
+// REQUIRES: swift_stdlib_no_asserts,optimized_stdlib
+
 // Check that the generic specializer does not hang a compiler by
 // creating and infinite loop of generic specializations.
 

test/SILOptimizer/hello-world.swift

@@ -1,6 +1,6 @@
 // RUN: rm -rf %t && mkdir -p %t/stats
 // RUN: %target-swift-frontend -emit-sil -stats-output-dir %t/stats %s -o /dev/null
 // RUN: %{python} %utils/process-stats-dir.py --evaluate 'NumSILGenFunctions < 10' %t/stats
-// RUN: %{python} %utils/process-stats-dir.py --evaluate 'NumSILOptFunctions < 10' %t/stats
+// RUN: %{python} %utils/process-stats-dir.py --evaluate 'NumSILOptFunctions < 20' %t/stats
 
 print("Hello world")

test/SILOptimizer/licm_exclusivity.swift

@@ -4,7 +4,7 @@
 // RUN: %target-swift-frontend -O -enforce-exclusivity=checked -emit-sil -Xllvm -debug-only=sil-licm -whole-module-optimization %s 2>&1 | %FileCheck %s --check-prefix=TESTLICMWMO
 // RUN: %target-swift-frontend -O -enforce-exclusivity=checked -emit-sil  -whole-module-optimization %s | %FileCheck %s --check-prefix=TESTSILWMO
 
-// REQUIRES: optimized_stdlib,asserts
+// REQUIRES: optimized_stdlib,asserts,swift_stdlib_no_asserts
 // REQUIRES: PTRSIZE=64
 
 // TESTLICM-LABEL: Processing loops in {{.*}}run_ReversedArray{{.*}}

test/SILOptimizer/stack_promotion_array_literal.swift

@@ -7,12 +7,12 @@
 // CHECK-LABEL: sil @{{.*}}testit
 // CHECK:  alloc_ref [stack] [tail_elems
 
-public func testit(_ N: Int) {
+public func testit(_ N: Int, _ x: Int) {
   for _ in 0..<N {
     for _ in 0..<10 {
        var nums = [Int]()
        for _ in 0..<40_000 {
-         nums += [1, 2, 3, 4, 5, 6, 7]
+         nums += [1, 2, 3, 4, 5, 6, x]
        }
     }
   }