Merge pull request #20671 from rudkx/conditionalize-disjunction-selection-on-designated-types

rudkx · web-flow · commit 89f9ce839d3e · 2018-11-17T23:12:35.000-08:00
Move a few more type checker perf tests over to compiling with design…
diff --git a/validation-test/Sema/type_checker_perf/fast/rdar19029974.swift b/validation-test/Sema/type_checker_perf/fast/rdar19029974.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1
+// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1 -solver-disable-shrink -disable-constraint-solver-performance-hacks -solver-enable-operator-designated-types
 // REQUIRES: tools-release,no_asserts
 
 infix operator <*> : AdditionPrecedence
diff --git a/validation-test/Sema/type_checker_perf/fast/rdar24543332.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar24543332.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 5 --end 20 --step 1 --select NumLeafScopes %s
+// RUN: %scale-test --begin 5 --end 20 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 
diff --git a/validation-test/Sema/type_checker_perf/fast/rdar29358447.swift.gyb b/validation-test/Sema/type_checker_perf/fast/rdar29358447.swift.gyb
@@ -1,4 +1,4 @@
-// RUN: %scale-test --begin 0 --end 25000 --step 1000 --typecheck --select incrementConstraintsPerContractionCounter %s
+// RUN: %scale-test --begin 0 --end 25000 --step 1000 --typecheck --select incrementConstraintsPerContractionCounter %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1`
	`1`	`+// RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1 -solver-disable-shrink -disable-constraint-solver-performance-hacks -solver-enable-operator-designated-types`
`2`	`2`	`// REQUIRES: tools-release,no_asserts`
`3`	`3`
`4`	`4`	`infix operator <*> : AdditionPrecedence`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %scale-test --begin 5 --end 20 --step 1 --select NumLeafScopes %s`
	`1`	`+// RUN: %scale-test --begin 5 --end 20 --step 1 --select NumLeafScopes %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types`
`2`	`2`	`// REQUIRES: OS=macosx`
`3`	`3`	`// REQUIRES: asserts`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %scale-test --begin 0 --end 25000 --step 1000 --typecheck --select incrementConstraintsPerContractionCounter %s`
	`1`	`+// RUN: %scale-test --begin 0 --end 25000 --step 1000 --typecheck --select incrementConstraintsPerContractionCounter %s -Xfrontend=-solver-disable-shrink -Xfrontend=-disable-constraint-solver-performance-hacks -Xfrontend=-solver-enable-operator-designated-types`
`2`	`2`	`// REQUIRES: OS=macosx`
`3`	`3`	`// REQUIRES: asserts`
`4`	`4`