Codegen tweaks to ParallelHelper

Sergio0694 · Sergio0694 · commit 9be700805aae · 2020-12-16T00:31:30.000+01:00
diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IInAction.cs b/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IInAction.cs
@@ -143,12 +143,14 @@ public void Invoke(int i)
                     end = Math.Min(high, this.memory.Length);
 
                 ref TItem r0 = ref MemoryMarshal.GetReference(this.memory.Span);
+                ref TItem rStart = ref Unsafe.Add(ref r0, low);
+                ref TItem rEnd = ref Unsafe.Add(ref r0, end);
 
-                for (int j = low; j < end; j++)
+                while (Unsafe.IsAddressLessThan(ref rStart, ref rEnd))
                 {
-                    ref TItem rj = ref Unsafe.Add(ref r0, (nint)(uint)j);
+                    Unsafe.AsRef(this.action).Invoke(in rStart);
 
-                    Unsafe.AsRef(this.action).Invoke(rj);
+                    rStart = ref Unsafe.Add(ref rStart, 1);
                 }
             }
         }
diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IInAction2D.cs b/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IInAction2D.cs
@@ -145,13 +145,14 @@ public void Invoke(int i)
 
                 for (int y = lowY; y < stopY; y++)
                 {
-                    ref TItem r0 = ref span.DangerousGetReferenceAt(y, 0);
+                    ref TItem rStart = ref span.DangerousGetReferenceAt(y, 0);
+                    ref TItem rEnd = ref Unsafe.Add(ref rStart, width);
 
-                    for (int x = 0; x < width; x++)
+                    while (Unsafe.IsAddressLessThan(ref rStart, ref rEnd))
                     {
-                        ref TItem ryx = ref Unsafe.Add(ref r0, (nint)(uint)x);
+                        Unsafe.AsRef(this.action).Invoke(in rStart);
 
-                        Unsafe.AsRef(this.action).Invoke(ryx);
+                        rStart = ref Unsafe.Add(ref rStart, 1);
                     }
                 }
             }
diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IRefAction.cs b/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IRefAction.cs
@@ -143,12 +143,14 @@ public void Invoke(int i)
                     end = Math.Min(high, this.memory.Length);
 
                 ref TItem r0 = ref MemoryMarshal.GetReference(this.memory.Span);
+                ref TItem rStart = ref Unsafe.Add(ref r0, low);
+                ref TItem rEnd = ref Unsafe.Add(ref r0, end);
 
-                for (int j = low; j < end; j++)
+                while (Unsafe.IsAddressLessThan(ref rStart, ref rEnd))
                 {
-                    ref TItem rj = ref Unsafe.Add(ref r0, (nint)(uint)j);
+                    Unsafe.AsRef(this.action).Invoke(ref rStart);
 
-                    Unsafe.AsRef(this.action).Invoke(ref rj);
+                    rStart = ref Unsafe.Add(ref rStart, 1);
                 }
             }
         }
diff --git a/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IRefAction2D.cs b/Microsoft.Toolkit.HighPerformance/Helpers/ParallelHelper.ForEach.IRefAction2D.cs
@@ -152,13 +152,14 @@ public void Invoke(int i)
 
                 for (int y = lowY; y < stopY; y++)
                 {
-                    ref TItem r0 = ref span.DangerousGetReferenceAt(y, 0);
+                    ref TItem rStart = ref span.DangerousGetReferenceAt(y, 0);
+                    ref TItem rEnd = ref Unsafe.Add(ref rStart, width);
 
-                    for (int x = 0; x < width; x++)
+                    while (Unsafe.IsAddressLessThan(ref rStart, ref rEnd))
                     {
-                        ref TItem ryx = ref Unsafe.Add(ref r0, (nint)(uint)x);
+                        Unsafe.AsRef(this.action).Invoke(ref rStart);
 
-                        Unsafe.AsRef(this.action).Invoke(ref ryx);
+                        rStart = ref Unsafe.Add(ref rStart, 1);
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -143,12 +143,14 @@ public void Invoke(int i)`
`143`	`143`	`end = Math.Min(high, this.memory.Length);`
`144`	`144`
`145`	`145`	`ref TItem r0 = ref MemoryMarshal.GetReference(this.memory.Span);`
	`146`	`+ ref TItem rStart = ref Unsafe.Add(ref r0, low);`
	`147`	`+ ref TItem rEnd = ref Unsafe.Add(ref r0, end);`
`146`	`148`
`147`		`- for (int j = low; j < end; j++)`
	`149`	`+ while (Unsafe.IsAddressLessThan(ref rStart, ref rEnd))`
`148`	`150`	`{`
`149`		`- ref TItem rj = ref Unsafe.Add(ref r0, (nint)(uint)j);`
	`151`	`+ Unsafe.AsRef(this.action).Invoke(in rStart);`
`150`	`152`
`151`		`- Unsafe.AsRef(this.action).Invoke(rj);`
	`153`	`+ rStart = ref Unsafe.Add(ref rStart, 1);`
`152`	`154`	`}`
`153`	`155`	`}`
`154`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,13 +145,14 @@ public void Invoke(int i)`
`145`	`145`
`146`	`146`	`for (int y = lowY; y < stopY; y++)`
`147`	`147`	`{`
`148`		`- ref TItem r0 = ref span.DangerousGetReferenceAt(y, 0);`
	`148`	`+ ref TItem rStart = ref span.DangerousGetReferenceAt(y, 0);`
	`149`	`+ ref TItem rEnd = ref Unsafe.Add(ref rStart, width);`
`149`	`150`
`150`		`- for (int x = 0; x < width; x++)`
	`151`	`+ while (Unsafe.IsAddressLessThan(ref rStart, ref rEnd))`
`151`	`152`	`{`
`152`		`- ref TItem ryx = ref Unsafe.Add(ref r0, (nint)(uint)x);`
	`153`	`+ Unsafe.AsRef(this.action).Invoke(in rStart);`
`153`	`154`
`154`		`- Unsafe.AsRef(this.action).Invoke(ryx);`
	`155`	`+ rStart = ref Unsafe.Add(ref rStart, 1);`
`155`	`156`	`}`
`156`	`157`	`}`
`157`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,13 +152,14 @@ public void Invoke(int i)`
`152`	`152`
`153`	`153`	`for (int y = lowY; y < stopY; y++)`
`154`	`154`	`{`
`155`		`- ref TItem r0 = ref span.DangerousGetReferenceAt(y, 0);`
	`155`	`+ ref TItem rStart = ref span.DangerousGetReferenceAt(y, 0);`
	`156`	`+ ref TItem rEnd = ref Unsafe.Add(ref rStart, width);`
`156`	`157`
`157`		`- for (int x = 0; x < width; x++)`
	`158`	`+ while (Unsafe.IsAddressLessThan(ref rStart, ref rEnd))`
`158`	`159`	`{`
`159`		`- ref TItem ryx = ref Unsafe.Add(ref r0, (nint)(uint)x);`
	`160`	`+ Unsafe.AsRef(this.action).Invoke(ref rStart);`
`160`	`161`
`161`		`- Unsafe.AsRef(this.action).Invoke(ref ryx);`
	`162`	`+ rStart = ref Unsafe.Add(ref rStart, 1);`
`162`	`163`	`}`
`163`	`164`	`}`
`164`	`165`	`}`