Skip to content

Commit d93d150

Browse files
stefanunitystefanunity
authored
CHANGE: switch performance tests to DynamicMeasurementCount() (#2162)
1 parent 3f65a3c commit d93d150

File tree

1 file changed

+35
-36
lines changed

1 file changed

+35
-36
lines changed

‎Assets/Tests/InputSystem/CorePerformanceTests.cs‎

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void Performance_MakeCircles()
4040
{
4141
SpriteUtilities.CreateCircleSprite(16, new Color32(255, 255, 255, 255));
4242
})
43-
.MeasurementCount(100)
43+
.DynamicMeasurementCount()
4444
.WarmupCount(5)
4545
.Run();
4646
}
@@ -62,7 +62,7 @@ public void Performance_Update10Gamepads()
6262
InputSystem.QueueStateEvent(gamepads[i], default(GamepadState));
6363
InputSystem.Update();
6464
})
65-
.MeasurementCount(100)
65+
.DynamicMeasurementCount()
6666
.WarmupCount(5)
6767
.Run();
6868
}
@@ -79,7 +79,7 @@ public void Performance_UpdateMouse100TimesInFrame()
7979
InputSystem.QueueStateEvent(mouse, default(MouseState));
8080
InputSystem.Update();
8181
})
82-
.MeasurementCount(100)
82+
.DynamicMeasurementCount()
8383
.WarmupCount(5)
8484
.Run();
8585
}
@@ -110,7 +110,7 @@ public void Performance_TwoTouchesOverThreeFrames(bool enableEnhancedTouch)
110110
EndTouch(2, new Vector2(111, 222), queueEventOnly: true);
111111
InputSystem.Update();
112112
})
113-
.MeasurementCount(100)
113+
.DynamicMeasurementCount()
114114
.WarmupCount(5)
115115
.Run();
116116
}
@@ -131,7 +131,7 @@ public void Performance_ReadEveryKey()
131131
key.ReadValue();
132132
}
133133
})
134-
.MeasurementCount(100)
134+
.DynamicMeasurementCount()
135135
.WarmupCount(5)
136136
.Run();
137137
}
@@ -155,7 +155,7 @@ public void Performance_ReadControl(string deviceLayout, string controlPath)
155155
throw new NotImplementedException();
156156

157157
Measure.Method(method)
158-
.MeasurementCount(200)
158+
.DynamicMeasurementCount()
159159
.WarmupCount(5)
160160
.Run();
161161
}
@@ -172,7 +172,7 @@ public void Performance_CreateDevice(string layoutName)
172172
InputControlLayout.s_Layouts.precompiledLayouts.Clear();
173173

174174
Measure.Method(() => InputDevice.Build<InputDevice>(layoutName))
175-
.MeasurementCount(100)
175+
.DynamicMeasurementCount()
176176
.WarmupCount(5)
177177
.Run();
178178
}
@@ -186,7 +186,7 @@ public void Performance_CreateDevice(string layoutName)
186186
public void Performance_CreatePrecompiledDevice(string layoutName)
187187
{
188188
Measure.Method(() => InputDevice.Build<InputDevice>(layoutName))
189-
.MeasurementCount(100)
189+
.DynamicMeasurementCount()
190190
.WarmupCount(5)
191191
.Run();
192192
}
@@ -200,7 +200,7 @@ public void Performance_TriggerAction()
200200
action.Enable();
201201

202202
Measure.Method(() => PressAndRelease(gamepad.buttonSouth))
203-
.MeasurementCount(100)
203+
.DynamicMeasurementCount()
204204
.WarmupCount(5)
205205
.Run();
206206
}
@@ -216,7 +216,7 @@ public void Performance_ReadActionValue_InCallback()
216216
action.performed += ctx => ctx.ReadValue<float>();
217217

218218
Measure.Method(() => PressAndRelease(gamepad.buttonSouth))
219-
.MeasurementCount(100)
219+
.DynamicMeasurementCount()
220220
.WarmupCount(5)
221221
.Run();
222222
}
@@ -232,7 +232,7 @@ public void Performance_ReadActionValue()
232232
Press(gamepad.buttonSouth);
233233

234234
Measure.Method(() => action.ReadValue<float>())
235-
.MeasurementCount(100)
235+
.DynamicMeasurementCount()
236236
.WarmupCount(5)
237237
.Run();
238238
}
@@ -252,7 +252,7 @@ public void Performance_ListenForUnpairedDeviceActivity()
252252
BeginTouch(1, new Vector2(123, 234));
253253
EndTouch(1, new Vector2(234, 345));
254254
})
255-
.MeasurementCount(100)
255+
.DynamicMeasurementCount()
256256
.WarmupCount(5)
257257
.Run();
258258
}
@@ -293,7 +293,7 @@ public unsafe void Performance_SearchForChangedButtonInEvent_Manually()
293293
}
294294
Assert.That(foundIt, Is.True);
295295
})
296-
.MeasurementCount(500)
296+
.DynamicMeasurementCount()
297297
.WarmupCount(5)
298298
.Run();
299299
}
@@ -327,7 +327,7 @@ public void Performance_SearchForChangedButtonInEvent_UsingEnumerateChangedContr
327327
}
328328
Assert.That(foundIt, Is.True);
329329
})
330-
.MeasurementCount(500)
330+
.DynamicMeasurementCount()
331331
.WarmupCount(5)
332332
.Run();
333333
}
@@ -367,7 +367,7 @@ public void Performance_AutoSwitchingOfControlSchemesInPlayerInput_UnrelatedDevi
367367
InputSystem.QueueStateEvent(mouse, new MouseState { position = new Vector2(678, 789)});
368368
InputSystem.Update();
369369
})
370-
.MeasurementCount(500)
370+
.DynamicMeasurementCount()
371371
.WarmupCount(5)
372372
.Run();
373373
}
@@ -405,7 +405,7 @@ public void Performance_AutoSwitchingOfControlSchemesInPlayerInput_SwitchBackAnd
405405
PressAndRelease(gamepad.buttonSouth);
406406
PressAndRelease(keyboard.spaceKey);
407407
})
408-
.MeasurementCount(500)
408+
.DynamicMeasurementCount()
409409
.WarmupCount(5)
410410
.Run();
411411
}
@@ -427,7 +427,7 @@ public void Performance_Rebinding_OneSuccessfulCycle()
427427
Assert.That(action.controls[0], Is.SameAs(gamepad.buttonNorth));
428428
}
429429
})
430-
.MeasurementCount(100)
430+
.DynamicMeasurementCount()
431431
.WarmupCount(5)
432432
.Run();
433433
}
@@ -455,7 +455,7 @@ public void Performance_LookupActionByName(LookupByName lookup)
455455
{
456456
var _ = asset[(lookup == LookupByName.CaseDoesNotMatch ? "ACTION" : "action") + (int)(kActionCount * 0.75f)];
457457
})
458-
.MeasurementCount(100)
458+
.DynamicMeasurementCount()
459459
.WarmupCount(5)
460460
.Run();
461461
}
@@ -483,7 +483,7 @@ public void Performance_LookupActionByGuid()
483483
{
484484
Assert.That(asset[actionToFind.id.ToString()], Is.SameAs(actionToFind));
485485
})
486-
.MeasurementCount(100)
486+
.DynamicMeasurementCount()
487487
.WarmupCount(5)
488488
.Run();
489489
}
@@ -507,7 +507,7 @@ public void Performance_MatchControlPathPrefix()
507507
Assert.That(result3, Is.True);
508508
Assert.That(result4, Is.False);
509509
})
510-
.MeasurementCount(100)
510+
.DynamicMeasurementCount()
511511
.WarmupCount(5)
512512
.Run();
513513
}
@@ -538,7 +538,7 @@ public void Performance_FindControlScheme(string device1, string device2 = null,
538538
match.Dispose();
539539
Assert.That(result, Is.EqualTo(success));
540540
})
541-
.MeasurementCount(100)
541+
.DynamicMeasurementCount()
542542
.WarmupCount(5)
543543
.Run();
544544
}
@@ -599,7 +599,7 @@ public void Performance_OptimizedControls_ReadingMousePosition100kTimes(Optimiza
599599
for (var i = 0; i < 100000; ++i)
600600
pos += mouse.position.ReadValue();
601601
})
602-
.MeasurementCount(100)
602+
.DynamicMeasurementCount()
603603
.WarmupCount(5)
604604
.Run();
605605
}
@@ -642,7 +642,7 @@ public void Performance_OptimizedControls_ReadAndUpdateMousePosition1kTimes(Opti
642642
}
643643
}
644644
})
645-
.MeasurementCount(100)
645+
.DynamicMeasurementCount()
646646
.WarmupCount(5)
647647
.Run();
648648
}
@@ -685,7 +685,7 @@ public void Performance_OptimizedControls_ReadAndUpdateGamepad1kTimes(Optimizati
685685
}
686686
}
687687
})
688-
.MeasurementCount(100)
688+
.DynamicMeasurementCount()
689689
.WarmupCount(10)
690690
.Run();
691691
}
@@ -722,7 +722,7 @@ public void Performance_OptimizedControls_ReadAndUpdateGamepadNewValuesEveryFram
722722
InputSystem.QueueStateEvent(gamepad, new GamepadState { leftStick = new Vector2(i / 1000f, i / 1000f) });
723723
}
724724
})
725-
.MeasurementCount(100)
725+
.DynamicMeasurementCount()
726726
.WarmupCount(10)
727727
.Run();
728728
}
@@ -768,7 +768,7 @@ public void Performance_OptimizedControls_ReadAndUpdateKeyboard1kTimes(Optimizat
768768
}
769769
}
770770
})
771-
.MeasurementCount(100)
771+
.DynamicMeasurementCount()
772772
.WarmupCount(10)
773773
.Run();
774774
}
@@ -810,7 +810,7 @@ public void Performance_OptimizedControls_ReadAndUpdateKeyboardNewValuesEveryFra
810810
InputSystem.QueueStateEvent(keyboard, new KeyboardState(Key.F));
811811
}
812812
})
813-
.MeasurementCount(100)
813+
.DynamicMeasurementCount()
814814
.WarmupCount(10)
815815
.Run();
816816
}
@@ -836,7 +836,7 @@ public void Performance_OptimizedControls_UpdateOnly1kTimes(OptimizationTestType
836836
{
837837
CallUpdate();
838838
})
839-
.MeasurementCount(100)
839+
.DynamicMeasurementCount()
840840
.SampleGroup("Mouse Only")
841841
.WarmupCount(10)
842842
.Run();
@@ -849,7 +849,7 @@ public void Performance_OptimizedControls_UpdateOnly1kTimes(OptimizationTestType
849849
{
850850
CallUpdate();
851851
})
852-
.MeasurementCount(100)
852+
.DynamicMeasurementCount()
853853
.SampleGroup("Gamepad Only")
854854
.WarmupCount(10)
855855
.Run();
@@ -912,7 +912,7 @@ public void Performance_OptimizedControls_Gamepad_250PressAndUpdate_WasPressedTh
912912
{
913913
CallUpdate();
914914
})
915-
.MeasurementCount(100)
915+
.DynamicMeasurementCount()
916916
.SampleGroup("Gamepad Only")
917917
.WarmupCount(10)
918918
.Run();
@@ -975,7 +975,7 @@ public void Performance_OptimizedControls_Keyboard_250PressAndUpdate_WasPressedT
975975
{
976976
CallUpdate();
977977
})
978-
.MeasurementCount(100)
978+
.DynamicMeasurementCount()
979979
.SampleGroup("Keyboard Only")
980980
.WarmupCount(10)
981981
.Run();
@@ -1011,7 +1011,7 @@ public void Performance_OptimizedControls_EvaluateStaleControlReadsWhenGamepadSt
10111011
{
10121012
MethodToMeasure(gamepad);
10131013
}).SampleGroup("ReadValueCaching Expected With WORSE Performance")
1014-
.MeasurementCount(100)
1014+
.DynamicMeasurementCount()
10151015
.WarmupCount(5)
10161016
.Run();
10171017

@@ -1039,7 +1039,7 @@ public void Performance_OptimizedControls_EvaluateStaleControlReadsWhenGamepadSt
10391039
{
10401040
MethodToMeasure(gamepad);
10411041
}).SampleGroup("ReadValueCaching Expected With BETTER Performance")
1042-
.MeasurementCount(100)
1042+
.DynamicMeasurementCount()
10431043
.WarmupCount(5)
10441044
.Run();
10451045

@@ -1100,7 +1100,7 @@ public void Performance_OptimizedControls_ReadingPose4kTimes(OptimizationTestTyp
11001100
for (var i = 0; i < 4000; ++i)
11011101
poseControl.ReadValue();
11021102
})
1103-
.MeasurementCount(100)
1103+
.DynamicMeasurementCount()
11041104
.WarmupCount(5)
11051105
.Run();
11061106
}
@@ -1202,10 +1202,9 @@ public IEnumerator Performance_MeasureInputSystemFrameTimeWithProfilerMarkers_FP
12021202
public IEnumerator Performance_MeasureInputSystemFrameTimeWithProfilerMarkers_DoingNothing()
12031203
{
12041204
yield return Measure.Frames()
1205-
.WarmupCount(30)
1206-
.DontRecordFrametime()
12071205
.MeasurementCount(500)
12081206
.ProfilerMarkers(allInputSystemProfilerMarkers)
1207+
.WarmupCount(5)
12091208
.Run();
12101209
}
12111210

0 commit comments

Comments
 (0)