Merge pull request #603 from tgiphil/017-PriortyQueue

- Switched to a real priority queue
mosa · Mar 3, 2019 · 3dd005c · 3dd005c
2 parents b82d87e + d15ee71
commit 3dd005c
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 111 deletions.
diff --git a/Source/Mosa.Compiler.Common/SimplePriorityQueue.cs b/Source/Mosa.Compiler.Common/SimplePriorityQueue.cs
diff --git a/Source/Mosa.Compiler.Framework.xUnit/Mosa.Compiler.Framework.xUnit.csproj b/Source/Mosa.Compiler.Framework.xUnit/Mosa.Compiler.Framework.xUnit.csproj
@@ -83,7 +83,6 @@
   <ItemGroup>
     <Compile Include="LiveRangeTests.cs" />
     <Compile Include="SparseBitArrayTests.cs" />
-    <Compile Include="SimplePriorityQueueTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>

diff --git a/Source/Mosa.Compiler.Framework.xUnit/SimplePriorityQueueTests.cs b/Source/Mosa.Compiler.Framework.xUnit/SimplePriorityQueueTests.cs
diff --git a/Source/Mosa.Compiler.Framework/Mosa.Compiler.Framework.csproj b/Source/Mosa.Compiler.Framework/Mosa.Compiler.Framework.csproj
@@ -2,6 +2,9 @@
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
+    <ItemGroup>
+      <PackageReference Include="OptimizedPriorityQueue" Version="4.2.0" />
+    </ItemGroup>
     <ItemGroup>
       <ProjectReference Include="..\Mosa.Compiler.MosaTypeSystem\Mosa.Compiler.MosaTypeSystem.csproj" />
       <ProjectReference Include="..\Mosa.Compiler.Common\Mosa.Compiler.Common.csproj" />

diff --git a/Source/Mosa.Compiler.Framework/RegisterAllocator/BaseRegisterAllocator.cs b/Source/Mosa.Compiler.Framework/RegisterAllocator/BaseRegisterAllocator.cs
@@ -6,6 +6,7 @@
 using Mosa.Compiler.Framework.IR;
 using Mosa.Compiler.Framework.Trace;
 using Mosa.Compiler.MosaTypeSystem;
+using Priority_Queue;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -33,7 +34,7 @@ public abstract class BaseRegisterAllocator
 		protected readonly List<ExtendedBlock> ExtendedBlocks;
 		protected readonly List<VirtualRegister> VirtualRegisters;
 
-		private readonly SimpleKeyPriorityQueue<LiveInterval> PriorityQueue;
+		private readonly SimplePriorityQueue<LiveInterval> PriorityQueue;
 		protected readonly List<LiveIntervalTrack> LiveIntervalTracks;
 
 		private readonly PhysicalRegister StackFrameRegister;
@@ -92,7 +93,7 @@ protected BaseRegisterAllocator(BasicBlocks basicBlocks, VirtualRegisters virtua
 				VirtualRegisters.Add(new VirtualRegister(virtualRegister));
 			}
 
-			PriorityQueue = new SimpleKeyPriorityQueue<LiveInterval>();
+			PriorityQueue = new SimplePriorityQueue<LiveInterval>();
 			SpilledIntervals = new List<LiveInterval>();
 
 			KillAll = new List<SlotIndex>();
@@ -634,9 +635,7 @@ private void ComputeLocalLiveSets()
 							liveGen.Set(index, true);
 
 							if (liveSetTrace.Active)
-							{
 								liveSetTrace.Log("GEN:  " + index.ToString() + " " + op);
-							}
 						}
 					}
 
@@ -948,7 +947,7 @@ protected void AddPriorityQueue(LiveInterval liveInterval)
 			// priority is based on allocation stage (primary, lower first) and interval size (secondary, higher first)
 			int value = CalculatePriorityValue(liveInterval);
 
-			PriorityQueue.Enqueue(value, liveInterval);
+			PriorityQueue.Enqueue(liveInterval, value);
 		}
 
 		private void PopulatePriorityQueue()
@@ -975,7 +974,7 @@ private void PopulatePriorityQueue()
 
 		private void ProcessPriorityQueue()
 		{
-			while (!PriorityQueue.IsEmpty)
+			while (PriorityQueue.Count != 0)
 			{
 				var liveInterval = PriorityQueue.Dequeue();
 

diff --git a/Source/Mosa.Compiler.Framework/RegisterAllocator/GreedyRegisterAllocator.cs b/Source/Mosa.Compiler.Framework/RegisterAllocator/GreedyRegisterAllocator.cs
@@ -55,11 +55,6 @@ protected override void CalculateSpillCost(LiveInterval liveInterval)
 			liveInterval.SpillValue = spillvalue;
 		}
 
-		protected override int CalculatePriorityValue(LiveInterval liveInterval)
-		{
-			return liveInterval.Length | ((int)((int)LiveInterval.AllocationStage.Max - liveInterval.Stage) << 28);
-		}
-
 		private bool PlaceLiveIntervalOnTrack(LiveInterval liveInterval, MoveHint[] hints)
 		{
 			if (hints == null)

diff --git a/Source/Mosa.Compiler.Framework/Stages/InlineStage.cs b/Source/Mosa.Compiler.Framework/Stages/InlineStage.cs
@@ -93,10 +93,10 @@ protected override void Run()
 
 				Inline(callSiteNode, blocks);
 
-				if (!BasicBlocks.RuntimeValidation())
-				{
-					throw new CompilerException($"InlineStage: Block Validation after inlining: {invokedMethod} into {Method}");
-				}
+				//if (!BasicBlocks.RuntimeValidation())
+				//{
+				//	throw new CompilerException($"InlineStage: Block Validation after inlining: {invokedMethod} into {Method}");
+				//}
 			}
 
 			InlinedMethodsCount.Set(1);