NEW: Added InputDeviceMatcher.WithManufacturerContains(string noRegexMatch) to improve DualShockSupport initialization performance (#1990)

* [InputSystem] Added WithManufacturerContains.WithManufacturerContains(string) - improve DualShockSupport initialization performance

o WithManufacturerContains() provides for simple keyword (no regex)  matching in the manufacturer string
o Changes DualShock4Gamepad / DualShock3Gamepad matchers to avoid regex creation on initialization

These changes save 25ms in DualShockSupport.Initialize during player start-up (26ms -> 1ms)

* [InputSystem] Improve parameter name: WithManufacturerContains(string noRegexMatch), added chanelog entry (ISX-1411)

* [InputSystem] Fixed typo in CHANGELOG

* [InputSystem] Fix string check in MatchSinglePropertyContains()

o Was looking for manufacturer string in pattern not pattern in manufacturer string (doh!)

* [InputSystem] Fix formatting of modified files (used unity-meta format tool)

Author: AlexTyrer

Packages/com.unity.inputsystem/CHANGELOG.md

@@ -19,6 +19,7 @@ however, it has to be formatted properly to pass verification tests.
 
 ### Added
 - Added Hinge Angle sensor support for foldable devices.
+- Added InputDeviceMatcher.WithManufacturerContains(string noRegexMatch) API to improve DualShockSupport.Initialize performance (ISX-1411)
 
 ### Changed
 - Use `ProfilerMarker` instead of `Profiler.BeginSample` and `Profiler.EndSample` when appropriate to enable recording of profiling data.

Packages/com.unity.inputsystem/InputSystem/Devices/InputDeviceMatcher.cs

@@ -142,6 +142,17 @@ public InputDeviceMatcher WithManufacturer(string pattern, bool supportRegex = t
             return With(kManufacturerKey, pattern, supportRegex);
         }
 
+        /// <summary>
+        /// Add a pattern (simple string) to <see cref="patterns"/> to match a <see cref="InputDeviceDescription.manufacturer"/>.
+        /// </summary>
+        /// <param name="noRegExPattern">String to match - simple keyword search in a device manufacturer string (eg "SONY").</param>
+        /// <returns>The modified device matcher with the added pattern.</returns>
+        /// <seealso cref="InputDeviceDescription.manufacturer"/>
+        public InputDeviceMatcher WithManufacturerContains(string noRegExPattern)
+        {
+            return With(kManufacturerContainsKey, noRegExPattern, supportRegex: false);
+        }
+
         /// <summary>
         /// Add a pattern to <see cref="patterns"/> to match a <see cref="InputDeviceDescription.product"/>.
         /// </summary>
@@ -309,6 +320,12 @@ public float MatchPercentage(InputDeviceDescription deviceDescription)
                         || !MatchSingleProperty(pattern, deviceDescription.manufacturer))
                         return 0;
                 }
+                else if (key == kManufacturerContainsKey)
+                {
+                    if (string.IsNullOrEmpty(deviceDescription.manufacturer)
+                        || !MatchSinglePropertyContains(pattern, deviceDescription.manufacturer))
+                        return 0;
+                }
                 else if (key == kProductKey)
                 {
                     if (string.IsNullOrEmpty(deviceDescription.product)
@@ -357,6 +374,15 @@ private static bool MatchSingleProperty(object pattern, string value)
             return false;
         }
 
+        private static bool MatchSinglePropertyContains(object pattern, string value)
+        {
+            // String match.
+            if (pattern is string str)
+                return value.Contains(str, StringComparison.OrdinalIgnoreCase);
+
+            return false;
+        }
+
         private static int GetNumPropertiesIn(InputDeviceDescription description)
         {
             var count = 0;
@@ -518,6 +544,7 @@ public override int GetHashCode()
         private static readonly InternedString kInterfaceKey = new InternedString("interface");
         private static readonly InternedString kDeviceClassKey = new InternedString("deviceClass");
         private static readonly InternedString kManufacturerKey = new InternedString("manufacturer");
+        private static readonly InternedString kManufacturerContainsKey = new InternedString("manufacturerContains");
         private static readonly InternedString kProductKey = new InternedString("product");
         private static readonly InternedString kVersionKey = new InternedString("version");
 
@@ -529,6 +556,7 @@ internal struct MatcherJson
             public string deviceClass;
             public string[] deviceClasses;
             public string manufacturer;
+            public string manufacturerContains;
             public string[] manufacturers;
             public string product;
             public string[] products;
@@ -617,13 +645,17 @@ public InputDeviceMatcher ToMatcher()
                     foreach (var value in deviceClasses)
                         matcher = matcher.WithDeviceClass(value);
 
-                // Manufacturer.
+                // Manufacturer (string or regex)
                 if (!string.IsNullOrEmpty(manufacturer))
                     matcher = matcher.WithManufacturer(manufacturer);
                 if (manufacturers != null)
                     foreach (var value in manufacturers)
                         matcher = matcher.WithManufacturer(value);
 
+                // ManufacturerContains (simple string, can occur anywhere in the reported manufacturer string)
+                if (!string.IsNullOrEmpty(manufacturerContains))
+                    matcher = matcher.WithManufacturerContains(manufacturerContains);
+
                 // Product.
                 if (!string.IsNullOrEmpty(product))
                     matcher = matcher.WithProduct(product);

Packages/com.unity.inputsystem/InputSystem/Plugins/DualShock/DualShockSupport.cs

@@ -53,7 +53,8 @@ public static void Initialize()
             InputSystem.RegisterLayoutMatcher<DualShock4GamepadHID>(
                 new InputDeviceMatcher()
                     .WithInterface("HID")
-                    .WithManufacturer("Sony.+Entertainment")
+                    .WithManufacturerContains("Sony")
+                    .WithManufacturerContains("Entertainment")
                     .WithProduct("Wireless Controller"));
 
             InputSystem.RegisterLayout<DualShock3GamepadHID>(
@@ -65,8 +66,9 @@ public static void Initialize()
             InputSystem.RegisterLayoutMatcher<DualShock3GamepadHID>(
                 new InputDeviceMatcher()
                     .WithInterface("HID")
-                    .WithManufacturer("Sony.+Entertainment")
-                    .WithProduct("PLAYSTATION(R)3 Controller"));
+                    .WithManufacturerContains("Sony")
+                    .WithManufacturerContains("Entertainment")
+                    .WithProduct("PLAYSTATION(R)3 Controller", supportRegex: false));
             #endif
         }
     }