Increase iteration counts in threading perf tests (#28712)

kouvel · stephentoub · commit b01e361a6f84 · 2018-04-02T10:41:14.000-07:00
Relevant to https://github.com/dotnet/coreclr/issues/17345
diff --git a/src/System.Threading/tests/Performance/Perf.EventWaitHandle.cs b/src/System.Threading/tests/Performance/Perf.EventWaitHandle.cs
@@ -9,18 +9,21 @@ namespace System.Threading.Tests
 {
     public class Perf_EventWaitHandle
     {
-        [Benchmark]
+        [Benchmark(InnerIterationCount = 100_000)]
         public void Set_Reset()
         {
-            foreach (var iteration in Benchmark.Iterations)
+            using (EventWaitHandle are = new EventWaitHandle(false, EventResetMode.AutoReset))
             {
-                using (EventWaitHandle are = new EventWaitHandle(false, EventResetMode.AutoReset))
-                using (iteration.StartMeasurement())
+                foreach (var iteration in Benchmark.Iterations)
                 {
-                    are.Set(); are.Reset(); are.Set(); are.Reset();
-                    are.Set(); are.Reset(); are.Set(); are.Reset();
-                    are.Set(); are.Reset(); are.Set(); are.Reset();
-                    are.Set(); are.Reset(); are.Set(); are.Reset();
+                    using (iteration.StartMeasurement())
+                    {
+                        for (int i = 0; i < Benchmark.InnerIterationCount; i++)
+                        {
+                            are.Set();
+                            are.Reset();
+                        }
+                    }
                 }
             }
         }
diff --git a/src/System.Threading/tests/Performance/Perf.Interlocked.cs b/src/System.Threading/tests/Performance/Perf.Interlocked.cs
@@ -8,7 +8,9 @@ namespace System.Threading.Tests
 {
     public class Perf_Interlocked
     {
-        [Benchmark(InnerIterationCount = 1000)]
+        private const int IterationCount = 10_000_000;
+
+        [Benchmark(InnerIterationCount = IterationCount)]
         public static void Increment_int()
         {
             int location = 0;
@@ -25,7 +27,7 @@ public static void Increment_int()
             }
         }
 
-        [Benchmark(InnerIterationCount = 1000)]
+        [Benchmark(InnerIterationCount = IterationCount)]
         public static void Decrement_int()
         {
             int location = 0;
@@ -42,7 +44,7 @@ public static void Decrement_int()
             }
         }
 
-        [Benchmark(InnerIterationCount = 1000)]
+        [Benchmark(InnerIterationCount = IterationCount)]
         public void Increment_long()
         {
             long location = 0;
@@ -59,7 +61,7 @@ public void Increment_long()
             }
         }
 
-        [Benchmark(InnerIterationCount = 1000)]
+        [Benchmark(InnerIterationCount = IterationCount)]
         public void Decrement_long()
         {
             long location = 0;
@@ -76,7 +78,7 @@ public void Decrement_long()
             }
         }
 
-        [Benchmark(InnerIterationCount = 1000)]
+        [Benchmark(InnerIterationCount = IterationCount)]
         public void Add_int()
         {
             int location = 0;
@@ -93,7 +95,7 @@ public void Add_int()
             }
         }
 
-        [Benchmark(InnerIterationCount = 1000)]
+        [Benchmark(InnerIterationCount = IterationCount)]
         public void Add_long()
         {
             long location = 0;
@@ -110,7 +112,7 @@ public void Add_long()
             }
         }
 
-        [Benchmark(InnerIterationCount = 1000)]
+        [Benchmark(InnerIterationCount = IterationCount)]
         public static void Exchange_int()
         {
             int location = 0;
@@ -128,7 +130,7 @@ public static void Exchange_int()
             }
         }
 
-        [Benchmark(InnerIterationCount = 1000)]
+        [Benchmark(InnerIterationCount = IterationCount)]
         public static void Exchange_long()
         {
             long location = 0;
@@ -146,7 +148,7 @@ public static void Exchange_long()
             }
         }
 
-        [Benchmark(InnerIterationCount = 500)]
+        [Benchmark(InnerIterationCount = IterationCount)]
         public static void CompareExchange_int()
         {
             int location = 0;
@@ -165,7 +167,7 @@ public static void CompareExchange_int()
             }
         }
 
-        [Benchmark(InnerIterationCount = 500)]
+        [Benchmark(InnerIterationCount = IterationCount)]
         public static void CompareExchange_long()
         {
             long location = 0;
diff --git a/src/System.Threading/tests/Performance/Perf.Lock.cs b/src/System.Threading/tests/Performance/Perf.Lock.cs
@@ -9,7 +9,7 @@ namespace System.Threading.Tests
 {
     public class Perf_Lock
     {
-        [Benchmark(InnerIterationCount = 100)]
+        [Benchmark(InnerIterationCount = 2_000_000)]
         public static void ReaderWriterLockSlimPerf()
         {
             ReaderWriterLockSlim rwLock = new ReaderWriterLockSlim();
diff --git a/src/System.Threading/tests/Performance/Perf.Monitor.cs b/src/System.Threading/tests/Performance/Perf.Monitor.cs
@@ -8,7 +8,9 @@ namespace System.Threading.Tests
 {
     public class Perf_Monitor
     {
-        [Benchmark(InnerIterationCount = 250)]
+        private const int IterationCount = 4_000_000;
+
+        [Benchmark(InnerIterationCount = IterationCount)]
         public static void EnterExit()
         {
             object sync = new object();
@@ -26,7 +28,7 @@ public static void EnterExit()
             }
         }
 
-        [Benchmark(InnerIterationCount = 100)]
+        [Benchmark(InnerIterationCount = IterationCount)]
         public static void TryEnterExit()
         {
             object sync = new object();
diff --git a/src/System.Threading/tests/Performance/Perf.SpinLock.cs b/src/System.Threading/tests/Performance/Perf.SpinLock.cs
@@ -8,7 +8,9 @@ namespace System.Threading.Tests
 {
     public class Perf_SpinLock
     {
-        [Benchmark(InnerIterationCount = 100)]
+        private const int IterationCount = 1_000_000;
+
+        [Benchmark(InnerIterationCount = IterationCount)]
         public void EnterExit()
         {
             SpinLock spinLock = new SpinLock();
@@ -28,7 +30,7 @@ public void EnterExit()
             }
         }
 
-        [Benchmark(InnerIterationCount = 100)]
+        [Benchmark(InnerIterationCount = IterationCount)]
         public void TryEnterExit()
         {
             SpinLock spinLock = new SpinLock();
diff --git a/src/System.Threading/tests/Performance/Perf.Volatile.cs b/src/System.Threading/tests/Performance/Perf.Volatile.cs
@@ -8,7 +8,9 @@ namespace System.Threading.Tests
 {
     public class Perf_Volatile
     {
-        [Benchmark(InnerIterationCount = 2000)]
+        private const int IterationCount = 100_000_000;
+
+        [Benchmark(InnerIterationCount = IterationCount)]
         public void Read_double()
         {
             double location = 0;
@@ -25,7 +27,7 @@ public void Read_double()
             }
         }
 
-        [Benchmark(InnerIterationCount = 2000)]
+        [Benchmark(InnerIterationCount = IterationCount)]
         public void Write_double()
         {
             double location = 0;

Original file line number	Diff line number	Diff line change
`@@ -9,18 +9,21 @@ namespace System.Threading.Tests`
`9`	`9`	`{`
`10`	`10`	`public class Perf_EventWaitHandle`
`11`	`11`	`{`
`12`		`- [Benchmark]`
	`12`	`+ [Benchmark(InnerIterationCount = 100_000)]`
`13`	`13`	`public void Set_Reset()`
`14`	`14`	`{`
`15`		`- foreach (var iteration in Benchmark.Iterations)`
	`15`	`+ using (EventWaitHandle are = new EventWaitHandle(false, EventResetMode.AutoReset))`
`16`	`16`	`{`
`17`		`- using (EventWaitHandle are = new EventWaitHandle(false, EventResetMode.AutoReset))`
`18`		`- using (iteration.StartMeasurement())`
	`17`	`+ foreach (var iteration in Benchmark.Iterations)`
`19`	`18`	`{`
`20`		`- are.Set(); are.Reset(); are.Set(); are.Reset();`
`21`		`- are.Set(); are.Reset(); are.Set(); are.Reset();`
`22`		`- are.Set(); are.Reset(); are.Set(); are.Reset();`
`23`		`- are.Set(); are.Reset(); are.Set(); are.Reset();`
	`19`	`+ using (iteration.StartMeasurement())`
	`20`	`+ {`
	`21`	`+ for (int i = 0; i < Benchmark.InnerIterationCount; i++)`
	`22`	`+ {`
	`23`	`+ are.Set();`
	`24`	`+ are.Reset();`
	`25`	`+ }`
	`26`	`+ }`
`24`	`27`	`}`
`25`	`28`	`}`
`26`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,9 @@ namespace System.Threading.Tests`
`8`	`8`	`{`
`9`	`9`	`public class Perf_Interlocked`
`10`	`10`	`{`
`11`		`- [Benchmark(InnerIterationCount = 1000)]`
	`11`	`+ private const int IterationCount = 10_000_000;`
	`12`	`+`
	`13`	`+ [Benchmark(InnerIterationCount = IterationCount)]`
`12`	`14`	`public static void Increment_int()`
`13`	`15`	`{`
`14`	`16`	`int location = 0;`
`@@ -25,7 +27,7 @@ public static void Increment_int()`
`25`	`27`	`}`
`26`	`28`	`}`
`27`	`29`
`28`		`- [Benchmark(InnerIterationCount = 1000)]`
	`30`	`+ [Benchmark(InnerIterationCount = IterationCount)]`
`29`	`31`	`public static void Decrement_int()`
`30`	`32`	`{`
`31`	`33`	`int location = 0;`
`@@ -42,7 +44,7 @@ public static void Decrement_int()`
`42`	`44`	`}`
`43`	`45`	`}`
`44`	`46`
`45`		`- [Benchmark(InnerIterationCount = 1000)]`
	`47`	`+ [Benchmark(InnerIterationCount = IterationCount)]`
`46`	`48`	`public void Increment_long()`
`47`	`49`	`{`
`48`	`50`	`long location = 0;`
`@@ -59,7 +61,7 @@ public void Increment_long()`
`59`	`61`	`}`
`60`	`62`	`}`
`61`	`63`
`62`		`- [Benchmark(InnerIterationCount = 1000)]`
	`64`	`+ [Benchmark(InnerIterationCount = IterationCount)]`
`63`	`65`	`public void Decrement_long()`
`64`	`66`	`{`
`65`	`67`	`long location = 0;`
`@@ -76,7 +78,7 @@ public void Decrement_long()`
`76`	`78`	`}`
`77`	`79`	`}`
`78`	`80`
`79`		`- [Benchmark(InnerIterationCount = 1000)]`
	`81`	`+ [Benchmark(InnerIterationCount = IterationCount)]`
`80`	`82`	`public void Add_int()`
`81`	`83`	`{`
`82`	`84`	`int location = 0;`
`@@ -93,7 +95,7 @@ public void Add_int()`
`93`	`95`	`}`
`94`	`96`	`}`
`95`	`97`
`96`		`- [Benchmark(InnerIterationCount = 1000)]`
	`98`	`+ [Benchmark(InnerIterationCount = IterationCount)]`
`97`	`99`	`public void Add_long()`
`98`	`100`	`{`
`99`	`101`	`long location = 0;`
`@@ -110,7 +112,7 @@ public void Add_long()`
`110`	`112`	`}`
`111`	`113`	`}`
`112`	`114`
`113`		`- [Benchmark(InnerIterationCount = 1000)]`
	`115`	`+ [Benchmark(InnerIterationCount = IterationCount)]`
`114`	`116`	`public static void Exchange_int()`
`115`	`117`	`{`
`116`	`118`	`int location = 0;`
`@@ -128,7 +130,7 @@ public static void Exchange_int()`
`128`	`130`	`}`
`129`	`131`	`}`
`130`	`132`
`131`		`- [Benchmark(InnerIterationCount = 1000)]`
	`133`	`+ [Benchmark(InnerIterationCount = IterationCount)]`
`132`	`134`	`public static void Exchange_long()`
`133`	`135`	`{`
`134`	`136`	`long location = 0;`
`@@ -146,7 +148,7 @@ public static void Exchange_long()`
`146`	`148`	`}`
`147`	`149`	`}`
`148`	`150`
`149`		`- [Benchmark(InnerIterationCount = 500)]`
	`151`	`+ [Benchmark(InnerIterationCount = IterationCount)]`
`150`	`152`	`public static void CompareExchange_int()`
`151`	`153`	`{`
`152`	`154`	`int location = 0;`
`@@ -165,7 +167,7 @@ public static void CompareExchange_int()`
`165`	`167`	`}`
`166`	`168`	`}`
`167`	`169`
`168`		`- [Benchmark(InnerIterationCount = 500)]`
	`170`	`+ [Benchmark(InnerIterationCount = IterationCount)]`
`169`	`171`	`public static void CompareExchange_long()`
`170`	`172`	`{`
`171`	`173`	`long location = 0;`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace System.Threading.Tests`
`9`	`9`	`{`
`10`	`10`	`public class Perf_Lock`
`11`	`11`	`{`
`12`		`- [Benchmark(InnerIterationCount = 100)]`
	`12`	`+ [Benchmark(InnerIterationCount = 2_000_000)]`
`13`	`13`	`public static void ReaderWriterLockSlimPerf()`
`14`	`14`	`{`
`15`	`15`	`ReaderWriterLockSlim rwLock = new ReaderWriterLockSlim();`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,9 @@ namespace System.Threading.Tests`
`8`	`8`	`{`
`9`	`9`	`public class Perf_Monitor`
`10`	`10`	`{`
`11`		`- [Benchmark(InnerIterationCount = 250)]`
	`11`	`+ private const int IterationCount = 4_000_000;`
	`12`	`+`
	`13`	`+ [Benchmark(InnerIterationCount = IterationCount)]`
`12`	`14`	`public static void EnterExit()`
`13`	`15`	`{`
`14`	`16`	`object sync = new object();`
`@@ -26,7 +28,7 @@ public static void EnterExit()`
`26`	`28`	`}`
`27`	`29`	`}`
`28`	`30`
`29`		`- [Benchmark(InnerIterationCount = 100)]`
	`31`	`+ [Benchmark(InnerIterationCount = IterationCount)]`
`30`	`32`	`public static void TryEnterExit()`
`31`	`33`	`{`
`32`	`34`	`object sync = new object();`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,9 @@ namespace System.Threading.Tests`
`8`	`8`	`{`
`9`	`9`	`public class Perf_SpinLock`
`10`	`10`	`{`
`11`		`- [Benchmark(InnerIterationCount = 100)]`
	`11`	`+ private const int IterationCount = 1_000_000;`
	`12`	`+`
	`13`	`+ [Benchmark(InnerIterationCount = IterationCount)]`
`12`	`14`	`public void EnterExit()`
`13`	`15`	`{`
`14`	`16`	`SpinLock spinLock = new SpinLock();`
`@@ -28,7 +30,7 @@ public void EnterExit()`
`28`	`30`	`}`
`29`	`31`	`}`
`30`	`32`
`31`		`- [Benchmark(InnerIterationCount = 100)]`
	`33`	`+ [Benchmark(InnerIterationCount = IterationCount)]`
`32`	`34`	`public void TryEnterExit()`
`33`	`35`	`{`
`34`	`36`	`SpinLock spinLock = new SpinLock();`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,9 @@ namespace System.Threading.Tests`
`8`	`8`	`{`
`9`	`9`	`public class Perf_Volatile`
`10`	`10`	`{`
`11`		`- [Benchmark(InnerIterationCount = 2000)]`
	`11`	`+ private const int IterationCount = 100_000_000;`
	`12`	`+`
	`13`	`+ [Benchmark(InnerIterationCount = IterationCount)]`
`12`	`14`	`public void Read_double()`
`13`	`15`	`{`
`14`	`16`	`double location = 0;`
`@@ -25,7 +27,7 @@ public void Read_double()`
`25`	`27`	`}`
`26`	`28`	`}`
`27`	`29`
`28`		`- [Benchmark(InnerIterationCount = 2000)]`
	`30`	`+ [Benchmark(InnerIterationCount = IterationCount)]`
`29`	`31`	`public void Write_double()`
`30`	`32`	`{`
`31`	`33`	`double location = 0;`