Switch threading perf tests to use constant instead of Benchmark.InnerIteration (dotnet#28728)

kouvel · stephentoub · commit bd8c8ed26d74 · 2018-04-02T15:11:34.000-07:00
diff --git a/src/System.Threading/tests/Performance/Perf.EventWaitHandle.cs b/src/System.Threading/tests/Performance/Perf.EventWaitHandle.cs
@@ -9,7 +9,9 @@ namespace System.Threading.Tests
 {
     public class Perf_EventWaitHandle
     {
-        [Benchmark(InnerIterationCount = 100_000)]
+        private const int IterationCount = 100_000;
+
+        [Benchmark(InnerIterationCount = IterationCount)]
         public void Set_Reset()
         {
             using (EventWaitHandle are = new EventWaitHandle(false, EventResetMode.AutoReset))
@@ -18,7 +20,7 @@ public void Set_Reset()
                 {
                     using (iteration.StartMeasurement())
                     {
-                        for (int i = 0; i < Benchmark.InnerIterationCount; i++)
+                        for (int i = 0; i < IterationCount; 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
@@ -19,7 +19,7 @@ public static void Increment_int()
             {
                 using (iteration.StartMeasurement())
                 {
-                    for (int i = 0; i < Benchmark.InnerIterationCount; i++)
+                    for (int i = 0; i < IterationCount; i++)
                     {
                         Interlocked.Increment(ref location);
                     }
@@ -36,7 +36,7 @@ public static void Decrement_int()
             {
                 using (iteration.StartMeasurement())
                 {
-                    for (int i = 0; i < Benchmark.InnerIterationCount; i++)
+                    for (int i = 0; i < IterationCount; i++)
                     {
                         Interlocked.Decrement(ref location);
                     }
@@ -53,7 +53,7 @@ public void Increment_long()
             {
                 using (iteration.StartMeasurement())
                 {
-                    for (int i = 0; i < Benchmark.InnerIterationCount; i++)
+                    for (int i = 0; i < IterationCount; i++)
                     {
                         Interlocked.Increment(ref location);
                     }
@@ -70,7 +70,7 @@ public void Decrement_long()
             {
                 using (iteration.StartMeasurement())
                 {
-                    for (int i = 0; i < Benchmark.InnerIterationCount; i++)
+                    for (int i = 0; i < IterationCount; i++)
                     {
                         Interlocked.Decrement(ref location);
                     }
@@ -87,7 +87,7 @@ public void Add_int()
             {
                 using (iteration.StartMeasurement())
                 {
-                    for (int i = 0; i < Benchmark.InnerIterationCount; i++)
+                    for (int i = 0; i < IterationCount; i++)
                     {
                         Interlocked.Add(ref location, 2);
                     }
@@ -104,7 +104,7 @@ public void Add_long()
             {
                 using (iteration.StartMeasurement())
                 {
-                    for (int i = 0; i < Benchmark.InnerIterationCount; i++)
+                    for (int i = 0; i < IterationCount; i++)
                     {
                         Interlocked.Add(ref location, 2);
                     }
@@ -122,7 +122,7 @@ public static void Exchange_int()
             {
                 using (iteration.StartMeasurement())
                 {
-                    for (int i = 0; i < Benchmark.InnerIterationCount; i++)
+                    for (int i = 0; i < IterationCount; i++)
                     {
                         Interlocked.Exchange(ref location, newValue);
                     }
@@ -140,7 +140,7 @@ public static void Exchange_long()
             {
                 using (iteration.StartMeasurement())
                 {
-                    for (int i = 0; i < Benchmark.InnerIterationCount; i++)
+                    for (int i = 0; i < IterationCount; i++)
                     {
                         Interlocked.Exchange(ref location, newValue);
                     }
@@ -159,7 +159,7 @@ public static void CompareExchange_int()
             {
                 using (iteration.StartMeasurement())
                 {
-                    for (int i = 0; i < Benchmark.InnerIterationCount; i++)
+                    for (int i = 0; i < IterationCount; i++)
                     {
                         Interlocked.CompareExchange(ref location, newValue, comparand);
                     }
@@ -178,7 +178,7 @@ public static void CompareExchange_long()
             {
                 using (iteration.StartMeasurement())
                 {
-                    for (int i = 0; i < Benchmark.InnerIterationCount; i++)
+                    for (int i = 0; i < IterationCount; i++)
                     {
                         Interlocked.CompareExchange(ref location, newValue, comparand);
                     }
diff --git a/src/System.Threading/tests/Performance/Perf.Lock.cs b/src/System.Threading/tests/Performance/Perf.Lock.cs
@@ -9,15 +9,17 @@ namespace System.Threading.Tests
 {
     public class Perf_Lock
     {
-        [Benchmark(InnerIterationCount = 2_000_000)]
+        private const int IterationCount = 2_000_000;
+
+        [Benchmark(InnerIterationCount = IterationCount)]
         public static void ReaderWriterLockSlimPerf()
         {
             ReaderWriterLockSlim rwLock = new ReaderWriterLockSlim();
             foreach (var iteration in Benchmark.Iterations)
             {
                 using (iteration.StartMeasurement())
                 {
-                    for (int i = 0; i < Benchmark.InnerIterationCount; i++)
+                    for (int i = 0; i < IterationCount; i++)
                     {
                         rwLock.EnterReadLock();
                         rwLock.ExitReadLock();
diff --git a/src/System.Threading/tests/Performance/Perf.Monitor.cs b/src/System.Threading/tests/Performance/Perf.Monitor.cs
@@ -19,7 +19,7 @@ public static void EnterExit()
             {
                 using (iteration.StartMeasurement())
                 {
-                    for (int i = 0; i < Benchmark.InnerIterationCount; i++)
+                    for (int i = 0; i < IterationCount; i++)
                     {
                         Monitor.Enter(sync);
                         Monitor.Exit(sync);
@@ -37,7 +37,7 @@ public static void TryEnterExit()
             {
                 using (iteration.StartMeasurement())
                 {
-                    for (int i = 0; i < Benchmark.InnerIterationCount; i++)
+                    for (int i = 0; i < IterationCount; i++)
                     {
                         Monitor.TryEnter(sync, 0);
                         Monitor.Exit(sync);
diff --git a/src/System.Threading/tests/Performance/Perf.SpinLock.cs b/src/System.Threading/tests/Performance/Perf.SpinLock.cs
@@ -19,7 +19,7 @@ public void EnterExit()
             {
                 using (iteration.StartMeasurement())
                 {
-                    for (int i = 0; i < Benchmark.InnerIterationCount; i++)
+                    for (int i = 0; i < IterationCount; i++)
                     {
                         bool lockTaken = false;
 
@@ -39,7 +39,7 @@ public void TryEnterExit()
             {
                 using (iteration.StartMeasurement())
                 {
-                    for (int i = 0; i < Benchmark.InnerIterationCount; i++)
+                    for (int i = 0; i < IterationCount; i++)
                     {
                         bool lockTaken = false;
 
diff --git a/src/System.Threading/tests/Performance/Perf.Volatile.cs b/src/System.Threading/tests/Performance/Perf.Volatile.cs
@@ -19,7 +19,7 @@ public void Read_double()
             {
                 using (iteration.StartMeasurement())
                 {
-                    for (int i = 0; i < Benchmark.InnerIterationCount; i++)
+                    for (int i = 0; i < IterationCount; i++)
                     {
                         Volatile.Read(ref location);
                     }
@@ -37,7 +37,7 @@ public void Write_double()
             {
                 using (iteration.StartMeasurement())
                 {
-                    for (int i = 0; i < Benchmark.InnerIterationCount; i++)
+                    for (int i = 0; i < IterationCount; i++)
                     {
                         Volatile.Write(ref location, newValue);
                     }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,9 @@ namespace System.Threading.Tests`
`9`	`9`	`{`
`10`	`10`	`public class Perf_EventWaitHandle`
`11`	`11`	`{`
`12`		`- [Benchmark(InnerIterationCount = 100_000)]`
	`12`	`+ private const int IterationCount = 100_000;`
	`13`	`+`
	`14`	`+ [Benchmark(InnerIterationCount = IterationCount)]`
`13`	`15`	`public void Set_Reset()`
`14`	`16`	`{`
`15`	`17`	`using (EventWaitHandle are = new EventWaitHandle(false, EventResetMode.AutoReset))`
`@@ -18,7 +20,7 @@ public void Set_Reset()`
`18`	`20`	`{`
`19`	`21`	`using (iteration.StartMeasurement())`
`20`	`22`	`{`
`21`		`- for (int i = 0; i < Benchmark.InnerIterationCount; i++)`
	`23`	`+ for (int i = 0; i < IterationCount; i++)`
`22`	`24`	`{`
`23`	`25`	`are.Set();`
`24`	`26`	`are.Reset();`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public static void Increment_int()`
`19`	`19`	`{`
`20`	`20`	`using (iteration.StartMeasurement())`
`21`	`21`	`{`
`22`		`- for (int i = 0; i < Benchmark.InnerIterationCount; i++)`
	`22`	`+ for (int i = 0; i < IterationCount; i++)`
`23`	`23`	`{`
`24`	`24`	`Interlocked.Increment(ref location);`
`25`	`25`	`}`
`@@ -36,7 +36,7 @@ public static void Decrement_int()`
`36`	`36`	`{`
`37`	`37`	`using (iteration.StartMeasurement())`
`38`	`38`	`{`
`39`		`- for (int i = 0; i < Benchmark.InnerIterationCount; i++)`
	`39`	`+ for (int i = 0; i < IterationCount; i++)`
`40`	`40`	`{`
`41`	`41`	`Interlocked.Decrement(ref location);`
`42`	`42`	`}`
`@@ -53,7 +53,7 @@ public void Increment_long()`
`53`	`53`	`{`
`54`	`54`	`using (iteration.StartMeasurement())`
`55`	`55`	`{`
`56`		`- for (int i = 0; i < Benchmark.InnerIterationCount; i++)`
	`56`	`+ for (int i = 0; i < IterationCount; i++)`
`57`	`57`	`{`
`58`	`58`	`Interlocked.Increment(ref location);`
`59`	`59`	`}`
`@@ -70,7 +70,7 @@ public void Decrement_long()`
`70`	`70`	`{`
`71`	`71`	`using (iteration.StartMeasurement())`
`72`	`72`	`{`
`73`		`- for (int i = 0; i < Benchmark.InnerIterationCount; i++)`
	`73`	`+ for (int i = 0; i < IterationCount; i++)`
`74`	`74`	`{`
`75`	`75`	`Interlocked.Decrement(ref location);`
`76`	`76`	`}`
`@@ -87,7 +87,7 @@ public void Add_int()`
`87`	`87`	`{`
`88`	`88`	`using (iteration.StartMeasurement())`
`89`	`89`	`{`
`90`		`- for (int i = 0; i < Benchmark.InnerIterationCount; i++)`
	`90`	`+ for (int i = 0; i < IterationCount; i++)`
`91`	`91`	`{`
`92`	`92`	`Interlocked.Add(ref location, 2);`
`93`	`93`	`}`
`@@ -104,7 +104,7 @@ public void Add_long()`
`104`	`104`	`{`
`105`	`105`	`using (iteration.StartMeasurement())`
`106`	`106`	`{`
`107`		`- for (int i = 0; i < Benchmark.InnerIterationCount; i++)`
	`107`	`+ for (int i = 0; i < IterationCount; i++)`
`108`	`108`	`{`
`109`	`109`	`Interlocked.Add(ref location, 2);`
`110`	`110`	`}`
`@@ -122,7 +122,7 @@ public static void Exchange_int()`
`122`	`122`	`{`
`123`	`123`	`using (iteration.StartMeasurement())`
`124`	`124`	`{`
`125`		`- for (int i = 0; i < Benchmark.InnerIterationCount; i++)`
	`125`	`+ for (int i = 0; i < IterationCount; i++)`
`126`	`126`	`{`
`127`	`127`	`Interlocked.Exchange(ref location, newValue);`
`128`	`128`	`}`
`@@ -140,7 +140,7 @@ public static void Exchange_long()`
`140`	`140`	`{`
`141`	`141`	`using (iteration.StartMeasurement())`
`142`	`142`	`{`
`143`		`- for (int i = 0; i < Benchmark.InnerIterationCount; i++)`
	`143`	`+ for (int i = 0; i < IterationCount; i++)`
`144`	`144`	`{`
`145`	`145`	`Interlocked.Exchange(ref location, newValue);`
`146`	`146`	`}`
`@@ -159,7 +159,7 @@ public static void CompareExchange_int()`
`159`	`159`	`{`
`160`	`160`	`using (iteration.StartMeasurement())`
`161`	`161`	`{`
`162`		`- for (int i = 0; i < Benchmark.InnerIterationCount; i++)`
	`162`	`+ for (int i = 0; i < IterationCount; i++)`
`163`	`163`	`{`
`164`	`164`	`Interlocked.CompareExchange(ref location, newValue, comparand);`
`165`	`165`	`}`
`@@ -178,7 +178,7 @@ public static void CompareExchange_long()`
`178`	`178`	`{`
`179`	`179`	`using (iteration.StartMeasurement())`
`180`	`180`	`{`
`181`		`- for (int i = 0; i < Benchmark.InnerIterationCount; i++)`
	`181`	`+ for (int i = 0; i < IterationCount; i++)`
`182`	`182`	`{`
`183`	`183`	`Interlocked.CompareExchange(ref location, newValue, comparand);`
`184`	`184`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,15 +9,17 @@ namespace System.Threading.Tests`
`9`	`9`	`{`
`10`	`10`	`public class Perf_Lock`
`11`	`11`	`{`
`12`		`- [Benchmark(InnerIterationCount = 2_000_000)]`
	`12`	`+ private const int IterationCount = 2_000_000;`
	`13`	`+`
	`14`	`+ [Benchmark(InnerIterationCount = IterationCount)]`
`13`	`15`	`public static void ReaderWriterLockSlimPerf()`
`14`	`16`	`{`
`15`	`17`	`ReaderWriterLockSlim rwLock = new ReaderWriterLockSlim();`
`16`	`18`	`foreach (var iteration in Benchmark.Iterations)`
`17`	`19`	`{`
`18`	`20`	`using (iteration.StartMeasurement())`
`19`	`21`	`{`
`20`		`- for (int i = 0; i < Benchmark.InnerIterationCount; i++)`
	`22`	`+ for (int i = 0; i < IterationCount; i++)`
`21`	`23`	`{`
`22`	`24`	`rwLock.EnterReadLock();`
`23`	`25`	`rwLock.ExitReadLock();`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public static void EnterExit()`
`19`	`19`	`{`
`20`	`20`	`using (iteration.StartMeasurement())`
`21`	`21`	`{`
`22`		`- for (int i = 0; i < Benchmark.InnerIterationCount; i++)`
	`22`	`+ for (int i = 0; i < IterationCount; i++)`
`23`	`23`	`{`
`24`	`24`	`Monitor.Enter(sync);`
`25`	`25`	`Monitor.Exit(sync);`
`@@ -37,7 +37,7 @@ public static void TryEnterExit()`
`37`	`37`	`{`
`38`	`38`	`using (iteration.StartMeasurement())`
`39`	`39`	`{`
`40`		`- for (int i = 0; i < Benchmark.InnerIterationCount; i++)`
	`40`	`+ for (int i = 0; i < IterationCount; i++)`
`41`	`41`	`{`
`42`	`42`	`Monitor.TryEnter(sync, 0);`
`43`	`43`	`Monitor.Exit(sync);`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public void EnterExit()`
`19`	`19`	`{`
`20`	`20`	`using (iteration.StartMeasurement())`
`21`	`21`	`{`
`22`		`- for (int i = 0; i < Benchmark.InnerIterationCount; i++)`
	`22`	`+ for (int i = 0; i < IterationCount; i++)`
`23`	`23`	`{`
`24`	`24`	`bool lockTaken = false;`
`25`	`25`
`@@ -39,7 +39,7 @@ public void TryEnterExit()`
`39`	`39`	`{`
`40`	`40`	`using (iteration.StartMeasurement())`
`41`	`41`	`{`
`42`		`- for (int i = 0; i < Benchmark.InnerIterationCount; i++)`
	`42`	`+ for (int i = 0; i < IterationCount; i++)`
`43`	`43`	`{`
`44`	`44`	`bool lockTaken = false;`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public void Read_double()`
`19`	`19`	`{`
`20`	`20`	`using (iteration.StartMeasurement())`
`21`	`21`	`{`
`22`		`- for (int i = 0; i < Benchmark.InnerIterationCount; i++)`
	`22`	`+ for (int i = 0; i < IterationCount; i++)`
`23`	`23`	`{`
`24`	`24`	`Volatile.Read(ref location);`
`25`	`25`	`}`
`@@ -37,7 +37,7 @@ public void Write_double()`
`37`	`37`	`{`
`38`	`38`	`using (iteration.StartMeasurement())`
`39`	`39`	`{`
`40`		`- for (int i = 0; i < Benchmark.InnerIterationCount; i++)`
	`40`	`+ for (int i = 0; i < IterationCount; i++)`
`41`	`41`	`{`
`42`	`42`	`Volatile.Write(ref location, newValue);`
`43`	`43`	`}`