Update -requirement-machine-* flags in various tests

- Don't pass 'verify' since it's now the default
- Update tests where diagnostics changed in a correct way to pass 'on' instead
- Delete compiler_scale/explicit_requirements_perf.swift since it's not testing anything with the requirement machine

Author: slavapestov

test/AutoDiff/SILGen/differentiability_witness_generic_signature.swift

@@ -1,5 +1,5 @@
-// RUN: %target-swift-emit-silgen -verify -module-name main %s | %FileCheck %s
-// RUN: %target-swift-emit-sil -verify -module-name main %s
+// RUN: %target-swift-emit-silgen -verify -module-name main %s -requirement-machine-inferred-signatures=on | %FileCheck %s
+// RUN: %target-swift-emit-sil -verify -module-name main %s -requirement-machine-inferred-signatures=on
 
 // NOTE(SR-11950): SILParser crashes for SILGen round-trip.
 
@@ -84,7 +84,7 @@ extension AllConcrete where T == Float {
   // Derivative generic signature: `<T where T == Float>` (explicit `where` clause)
   //    Witness generic signature: none
   @_silgen_name("allconcrete_where_gensig")
-  @differentiable(reverse where T == Float)
+  @differentiable(reverse where T == Float) // expected-warning {{redundant same-type constraint 'T' == 'Float'}}
   func whereClauseGenericSignature() -> AllConcrete {
     return self
   }
@@ -158,7 +158,7 @@ extension NotAllConcrete where T == Float {
   // Derivative generic signature: `<T, U where T == Float>` (explicit `where` clause)
   //    Witness generic signature: `<T, U where T == Float>` (not all concrete)
   @_silgen_name("notallconcrete_where_gensig")
-  @differentiable(reverse where T == Float)
+  @differentiable(reverse where T == Float) // expected-warning {{redundant same-type constraint 'T' == 'Float'}}
   func whereClauseGenericSignature() -> NotAllConcrete {
     return self
   }

test/AutoDiff/SILOptimizer/generics.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-sil -verify %s -requirement-machine-abstract-signatures=verify | %FileCheck %s -check-prefix=CHECK-SIL
+// RUN: %target-swift-emit-sil -verify %s -requirement-machine-inferred-signatures=on | %FileCheck %s -check-prefix=CHECK-SIL
 
 import _Differentiation
 
@@ -51,12 +51,12 @@ func foo<T>(_ x: Wrapper<T>) {
 
 // Test case where associated derivative function's requirements are met.
 extension Wrapper where Scalar : Numeric {
-  @differentiable(reverse, wrt: self where Scalar : Differentiable & FloatingPoint)
+  @differentiable(reverse, wrt: self where Scalar : Differentiable & FloatingPoint) // expected-warning {{redundant conformance constraint 'Scalar' : 'Differentiable'}}
   func mean() -> Wrapper {
     return self
   }
 
-  @differentiable(reverse, wrt: self where Scalar : Differentiable & FloatingPoint)
+  @differentiable(reverse, wrt: self where Scalar : Differentiable & FloatingPoint) // expected-warning {{redundant conformance constraint 'Scalar' : 'Differentiable'}}
   func variance() -> Wrapper {
     return mean() // ok
   }

test/Compatibility/anyobject_class.swift

@@ -1,6 +1,5 @@
-// RUN: %target-typecheck-verify-swift -swift-version 4
-// RUN: not %target-swift-frontend -typecheck -swift-version 5
+// RUN: %target-typecheck-verify-swift -swift-version 4 -requirement-machine-protocol-signatures=on
+// RUN: not %target-swift-frontend -typecheck -swift-version 5 -requirement-machine-protocol-signatures=on
 
 protocol P : class, AnyObject { } // expected-warning{{redundant inheritance from 'AnyObject' and Swift 3 'class' keyword}}{{14-21=}}
 // expected-warning@-1{{redundant constraint 'Self' : 'AnyObject'}}
-// expected-note@-2{{constraint 'Self' : 'AnyObject' implied here}}

test/Generics/associated_type_where_clause.swift

@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -swift-version 4
+// RUN: %target-typecheck-verify-swift -swift-version 4 -requirement-machine-protocol-signatures=on
 
 func needsSameType<T>(_: T.Type, _: T.Type) {}
 
@@ -133,7 +133,6 @@ struct X { }
 
 protocol P {
 	associatedtype P1 where P1 == X
-	// expected-note@-1{{same-type constraint 'Self.P1' == 'X' written here}}
 	associatedtype P2 where P2 == P1, P2 == X
 	// expected-warning@-1{{redundant same-type constraint 'Self.P2' == 'X'}}
 }

test/Generics/canonicalization.swift

@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift
+// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on
 
 // rdar://problem/23149063
 protocol P0 { }
@@ -13,8 +13,6 @@ protocol Q : P {
 
 func f<T>(t: T) where T : P, T : Q, T.A : P0 { } // expected-note{{'f(t:)' previously declared here}}
 // expected-warning@-1{{redundant conformance constraint 'T' : 'P'}}
-// expected-note@-2{{conformance constraint 'T' : 'P' implied here}}
 
 func f<T>(t: T) where T : Q, T : P, T.A : P0 { } // expected-error{{invalid redeclaration of 'f(t:)'}}
 // expected-warning@-1{{redundant conformance constraint 'T' : 'P'}}
-// expected-note@-2{{conformance constraint 'T' : 'P' implied here}}

test/Generics/concrete_conformances_in_protocol.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=verify 2>&1 | %FileCheck %s
+// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s
 
 // rdar://problem/88135912
 // XFAIL: *

test/Generics/concrete_nesting_elimination_order.swift

@@ -1,5 +1,5 @@
-// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=verify 2>&1 | %FileCheck %s
-// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-protocol-signatures=verify -disable-requirement-machine-concrete-contraction 2>&1 | %FileCheck %s
+// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s
+// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -disable-requirement-machine-concrete-contraction 2>&1 | %FileCheck %s
 
 protocol P1 {
   associatedtype T
@@ -45,4 +45,4 @@ protocol P8a : P7 where Y == C {}
 
 protocol P8b : P7 where Y == C {}
 
-// Make sure we pick 'Y == C' and not 'Y == G<C>' here.
+// Make sure we pick 'Y == C' and not 'Y == G<C>' here.

test/Generics/concrete_protocol_typealias_minimization.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures -requirement-machine-inferred-signatures=verify -requirement-machine-protocol-signatures=verify 2>&1 | %FileCheck %s
+// RUN: %target-swift-frontend -typecheck %s -debug-generic-signatures 2>&1 | %FileCheck %s
 
 protocol P1a {
   typealias X = Int

test/Generics/conditional_conformances.swift

@@ -1,5 +1,5 @@
-// RUN: %target-typecheck-verify-swift
-// RUN: %target-typecheck-verify-swift -debug-generic-signatures > %t.dump 2>&1
+// RUN: %target-typecheck-verify-swift -requirement-machine-inferred-signatures=on
+// RUN: %target-typecheck-verify-swift -debug-generic-signatures -requirement-machine-inferred-signatures=on > %t.dump 2>&1
 // RUN: %FileCheck %s < %t.dump
 
 protocol P1 {}
@@ -55,6 +55,7 @@ struct RedundantSuper<T: P4> {}
 // CHECK-LABEL: ExtensionDecl line={{.*}} base=RedundantSuper
 // CHECK-NEXT: (normal_conformance type=RedundantSuper<T> protocol=P2)
 extension RedundantSuper: P2 where T: P1 {}
+// expected-warning@-1 {{redundant conformance constraint 'T' : 'P1'}}
 
 struct OverlappingSub<T: P1> {}
 // CHECK-LABEL: ExtensionDecl line={{.*}} base=OverlappingSub
@@ -187,6 +188,7 @@ struct ClassLessSpecific<T: C3> {}
 // CHECK-LABEL: ExtensionDecl line={{.*}} base=ClassLessSpecific
 // CHECK-NEXT: (normal_conformance type=ClassLessSpecific<T> protocol=P2)
 extension ClassLessSpecific: P2 where T: C1 {}
+// expected-warning@-1 {{redundant superclass constraint 'T' : 'C1'}}
 
 
 // Inherited conformances:

test/Generics/conditional_requirement_inference.swift

@@ -1,6 +1,6 @@
 // RUN: %target-typecheck-verify-swift
-// RUN: %target-swift-frontend -typecheck -debug-generic-signatures -requirement-machine-inferred-signatures=verify %s 2>&1 | %FileCheck %s
-// RUN: %target-swift-frontend -typecheck -debug-generic-signatures -requirement-machine-inferred-signatures=verify %s -disable-requirement-machine-concrete-contraction 2>&1 | %FileCheck %s
+// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s 2>&1 | %FileCheck %s
+// RUN: %target-swift-frontend -typecheck -debug-generic-signatures %s -disable-requirement-machine-concrete-contraction 2>&1 | %FileCheck %s
 
 protocol Equatable {}
 
@@ -33,4 +33,4 @@ struct SillyBox<T : First> {
   func withArray<U, V>(_: U) where T == Array<U>, V == U.Y {
     sameType(U.X.self, U.Y.self)
   }
-}
+}