Merge branch 'master' into launcher-improvements

mosa · Apr 20, 2024 · 2b027cc · 2b027cc
2 parents b390a8c + 922e74c
commit 2b027cc
Show file tree

Hide file tree

Showing 35 changed files with 1,257 additions and 284 deletions.
diff --git a/Source/Mosa.BareMetal.HelloWorld/Apps/ShowPCI.cs b/Source/Mosa.BareMetal.HelloWorld/Apps/ShowPCI.cs
@@ -24,10 +24,10 @@ public void Execute()
 			Program.Bullet(ConsoleColor.Yellow);
 			Console.Write(" ");
 
-			var pciDevice = (PCIDevice)device.Parent.DeviceDriver;
+			var pciDevice = (PCIDeviceConfiguration)device.Configuration;
 			var name = device.DeviceDriverRegistryEntry == null ? "UnknownPCIDevice" : device.Name;
 
-			Program.InBrackets(pciDevice.Device.Name + ": " + name + " " + pciDevice.VendorID.ToString("x") + ":" + pciDevice.DeviceID.ToString("x") + " " + pciDevice.SubSystemID.ToString("x") + ":" + pciDevice.SubSystemVendorID.ToString("x") + " (" + pciDevice.ClassCode.ToString("x") + ":" + pciDevice.SubClassCode.ToString("x") + ":" + pciDevice.ProgIF.ToString("x") + ":" + pciDevice.RevisionID.ToString("x") + ")", ConsoleColor.White, ConsoleColor.Green);
+			Program.InBrackets(pciDevice.Name + ": " + name + " " + pciDevice.VendorID.ToString("x") + ":" + pciDevice.DeviceID.ToString("x") + " " + pciDevice.SubSystemID.ToString("x") + ":" + pciDevice.SubSystemVendorID.ToString("x") + " (" + pciDevice.ClassCode.ToString("x") + ":" + pciDevice.SubClassCode.ToString("x") + ":" + pciDevice.ProgIF.ToString("x") + ":" + pciDevice.RevisionID.ToString("x") + ")", ConsoleColor.White, ConsoleColor.Green);
 			Console.WriteLine();
 		}
 	}

diff --git a/Source/Mosa.Compiler.Common.xUnit/Mosa.Compiler.Common.xUnit.csproj b/Source/Mosa.Compiler.Common.xUnit/Mosa.Compiler.Common.xUnit.csproj
@@ -5,18 +5,18 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-		<PackageReference Include="xunit" Version="2.6.2" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+		<PackageReference Include="xunit" Version="2.7.1" />
 		<PackageReference Include="xunit.abstractions" Version="2.0.3" />
-		<PackageReference Include="xunit.analyzers" Version="1.6.0" />
-		<PackageReference Include="xunit.assert" Version="2.6.2" />
-		<PackageReference Include="xunit.core" Version="2.6.2" />
-		<PackageReference Include="xunit.extensibility.core" Version="2.6.2" />
-		<PackageReference Include="xunit.extensibility.execution" Version="2.6.2" />
-		<PackageReference Include="xunit.runner.console" Version="2.6.2">
+		<PackageReference Include="xunit.analyzers" Version="1.12.0" />
+		<PackageReference Include="xunit.assert" Version="2.7.1" />
+		<PackageReference Include="xunit.core" Version="2.7.1" />
+		<PackageReference Include="xunit.extensibility.core" Version="2.7.1" />
+		<PackageReference Include="xunit.extensibility.execution" Version="2.7.1" />
+		<PackageReference Include="xunit.runner.console" Version="2.7.1">
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
 	</ItemGroup>

diff --git a/Source/Mosa.Compiler.Framework.xUnit/Mosa.Compiler.Framework.xUnit.csproj b/Source/Mosa.Compiler.Framework.xUnit/Mosa.Compiler.Framework.xUnit.csproj
@@ -5,18 +5,18 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-		<PackageReference Include="xunit" Version="2.6.2" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+		<PackageReference Include="xunit" Version="2.7.1" />
 		<PackageReference Include="xunit.abstractions" Version="2.0.3" />
-		<PackageReference Include="xunit.analyzers" Version="1.6.0" />
-		<PackageReference Include="xunit.assert" Version="2.6.2" />
-		<PackageReference Include="xunit.core" Version="2.6.2" />
-		<PackageReference Include="xunit.extensibility.core" Version="2.6.2" />
-		<PackageReference Include="xunit.extensibility.execution" Version="2.6.2" />
-		<PackageReference Include="xunit.runner.console" Version="2.6.2">
+		<PackageReference Include="xunit.analyzers" Version="1.12.0" />
+		<PackageReference Include="xunit.assert" Version="2.7.1" />
+		<PackageReference Include="xunit.core" Version="2.7.1" />
+		<PackageReference Include="xunit.extensibility.core" Version="2.7.1" />
+		<PackageReference Include="xunit.extensibility.execution" Version="2.7.1" />
+		<PackageReference Include="xunit.runner.console" Version="2.7.1">
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.8">
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
 	</ItemGroup>

diff --git a/Source/Mosa.Compiler.Framework/Analysis/LoopDetector.cs b/Source/Mosa.Compiler.Framework/Analysis/LoopDetector.cs
@@ -74,7 +74,7 @@ private static void PopulateLoopNodes(BasicBlocks basicBlocks, Loop loop)
 				continue;
 
 			visited.Add(node);
-			loop.LoopBlocks.Add(node);
+			loop.AddNode(node);
 
 			foreach (var previous in node.PreviousBlocks)
 			{

diff --git a/Source/Mosa.Compiler.Framework/BaseTransform.cs b/Source/Mosa.Compiler.Framework/BaseTransform.cs
@@ -1183,19 +1183,19 @@ protected static bool IsBitValueZeroOrOne(Operand operand)
 				{
 					return (int)value1.BitsSet > (int)value2.BitsSet;
 				}
-				else if (value1.Is32Bit && value2.Is32Bit && value1.IsSignBitClear32 && value2.IsSignBitClear32 && value1.MinValue > value2.MaxValue)
+				else if (value1.Is32Bit && value2.Is32Bit && value1.IsSignBitKnown32 && value2.IsSignBitKnown32 && value1.IsSignBitClear32 && value2.IsSignBitClear32 && value1.MinValue > value2.MaxValue)
 				{
 					return true;
 				}
-				else if (value1.Is32Bit && value2.Is32Bit && value1.IsSignBitClear32 && value2.IsSignBitClear32 && value1.MaxValue < value2.MinValue)
+				else if (value1.Is32Bit && value2.Is32Bit && value1.IsSignBitKnown32 && value2.IsSignBitKnown32 && value1.IsSignBitClear32 && value2.IsSignBitClear32 && value1.MaxValue < value2.MinValue)
 				{
 					return false;
 				}
-				else if (value1.Is64Bit && value2.Is64Bit && value1.IsSignBitClear64 && value2.IsSignBitClear64 && value1.MinValue > value2.MaxValue)
+				else if (value1.Is64Bit && value2.Is64Bit && value1.IsSignBitKnown64 && value2.IsSignBitKnown64 && value1.IsSignBitClear64 && value2.IsSignBitClear64 && value1.MinValue > value2.MaxValue)
 				{
 					return true;
 				}
-				else if (value1.Is64Bit && value2.Is64Bit && value1.IsSignBitClear64 && value2.IsSignBitClear64 && value1.MaxValue < value2.MinValue)
+				else if (value1.Is64Bit && value2.Is64Bit && value1.IsSignBitKnown64 && value2.IsSignBitKnown64 && value1.IsSignBitClear64 && value2.IsSignBitClear64 && value1.MaxValue < value2.MinValue)
 				{
 					return false;
 				}
@@ -1211,19 +1211,19 @@ protected static bool IsBitValueZeroOrOne(Operand operand)
 				{
 					return (int)value1.BitsSet < (int)value2.BitsSet;
 				}
-				else if (value1.Is32Bit && value2.Is32Bit && value1.IsSignBitClear32 && value2.IsSignBitClear32 && value1.MaxValue < value2.MinValue)
+				else if (value1.Is32Bit && value2.Is32Bit && value1.IsSignBitKnown32 && value2.IsSignBitKnown32 && value1.IsSignBitClear32 && value2.IsSignBitClear32 && value1.MaxValue < value2.MinValue)
 				{
 					return true;
 				}
-				else if (value1.Is32Bit && value2.Is32Bit && value1.IsSignBitClear32 && value2.IsSignBitClear32 && value1.MinValue > value2.MaxValue)
+				else if (value1.Is32Bit && value2.Is32Bit && value1.IsSignBitKnown32 && value2.IsSignBitKnown32 && value1.IsSignBitClear32 && value2.IsSignBitClear32 && value1.MinValue > value2.MaxValue)
 				{
 					return false;
 				}
-				else if (value1.Is64Bit && value2.Is64Bit && value1.IsSignBitClear64 && value2.IsSignBitClear64 && value1.MaxValue < value2.MinValue)
+				else if (value1.Is64Bit && value2.Is64Bit && value1.IsSignBitKnown64 && value2.IsSignBitKnown64 && value1.IsSignBitClear64 && value2.IsSignBitClear64 && value1.MaxValue < value2.MinValue)
 				{
 					return true;
 				}
-				else if (value1.Is64Bit && value2.Is64Bit && value1.IsSignBitClear64 && value2.IsSignBitClear64 && value1.MinValue > value2.MaxValue)
+				else if (value1.Is64Bit && value2.Is64Bit && value1.IsSignBitKnown64 && value2.IsSignBitKnown64 && value1.IsSignBitClear64 && value2.IsSignBitClear64 && value1.MinValue > value2.MaxValue)
 				{
 					return false;
 				}
@@ -1239,19 +1239,19 @@ protected static bool IsBitValueZeroOrOne(Operand operand)
 				{
 					return (int)value1.BitsSet >= (int)value2.BitsSet;
 				}
-				else if (value1.Is32Bit && value2.Is32Bit && value1.IsSignBitClear32 && value2.IsSignBitClear32 && value1.MinValue >= value2.MaxValue)
+				else if (value1.Is32Bit && value2.Is32Bit && value1.IsSignBitKnown32 && value2.IsSignBitKnown32 && value1.IsSignBitClear32 && value2.IsSignBitClear32 && value1.MinValue >= value2.MaxValue)
 				{
 					return true;
 				}
-				else if (value1.Is32Bit && value2.Is32Bit && value1.IsSignBitClear32 && value2.IsSignBitClear32 && value1.MaxValue <= value2.MinValue)
+				else if (value1.Is32Bit && value2.Is32Bit && value1.IsSignBitKnown32 && value2.IsSignBitKnown32 && value1.IsSignBitClear32 && value2.IsSignBitClear32 && value1.MaxValue <= value2.MinValue)
 				{
 					return false;
 				}
-				else if (value1.Is64Bit && value2.Is64Bit && value1.IsSignBitClear64 && value2.IsSignBitClear64 && value1.MinValue >= value2.MaxValue)
+				else if (value1.Is64Bit && value2.Is64Bit && value1.IsSignBitKnown64 && value2.IsSignBitKnown64 && value1.IsSignBitClear64 && value2.IsSignBitClear64 && value1.MinValue >= value2.MaxValue)
 				{
 					return true;
 				}
-				else if (value1.Is64Bit && value2.Is64Bit && value1.IsSignBitClear64 && value2.IsSignBitClear64 && value1.MaxValue <= value2.MinValue)
+				else if (value1.Is64Bit && value2.Is64Bit && value1.IsSignBitKnown64 && value2.IsSignBitKnown64 && value1.IsSignBitClear64 && value2.IsSignBitClear64 && value1.MaxValue <= value2.MinValue)
 				{
 					return false;
 				}
@@ -1267,19 +1267,19 @@ protected static bool IsBitValueZeroOrOne(Operand operand)
 				{
 					return (int)value1.BitsSet <= (int)value2.BitsSet;
 				}
-				else if (value1.Is32Bit && value2.Is32Bit && value1.IsSignBitClear32 && value2.IsSignBitClear32 && value1.MaxValue <= value2.MinValue)
+				else if (value1.Is32Bit && value2.Is32Bit && value1.IsSignBitKnown32 && value2.IsSignBitKnown32 && value1.IsSignBitClear32 && value2.IsSignBitClear32 && value1.MaxValue <= value2.MinValue)
 				{
 					return true;
 				}
-				else if (value1.Is32Bit && value2.Is32Bit && value1.IsSignBitClear32 && value2.IsSignBitClear32 && value1.MinValue >= value2.MaxValue)
+				else if (value1.Is32Bit && value2.Is32Bit && value1.IsSignBitKnown32 && value2.IsSignBitKnown32 && value1.IsSignBitClear32 && value2.IsSignBitClear32 && value1.MinValue >= value2.MaxValue)
 				{
 					return false;
 				}
-				else if (value1.Is64Bit && value2.Is64Bit && value1.IsSignBitClear64 && value2.IsSignBitClear64 && value1.MaxValue <= value2.MinValue)
+				else if (value1.Is64Bit && value2.Is64Bit && value1.IsSignBitKnown64 && value2.IsSignBitKnown64 && value1.IsSignBitClear64 && value2.IsSignBitClear64 && value1.MaxValue <= value2.MinValue)
 				{
 					return true;
 				}
-				else if (value1.Is64Bit && value2.Is64Bit && value1.IsSignBitClear64 && value2.IsSignBitClear64 && value1.MinValue >= value2.MaxValue)
+				else if (value1.Is64Bit && value2.Is64Bit && value1.IsSignBitKnown64 && value2.IsSignBitKnown64 && value1.IsSignBitClear64 && value2.IsSignBitClear64 && value1.MinValue >= value2.MaxValue)
 				{
 					return false;
 				}

diff --git a/Source/Mosa.Compiler.Framework/BitValue.cs b/Source/Mosa.Compiler.Framework/BitValue.cs
@@ -188,6 +188,30 @@ public BitValue NarrowMin(ulong minValue)
 		return Narrow();
 	}
 
+	public BitValue NarrowSignRange(long minValue, long maxValue)
+	{
+		if (IsFixed)
+			return this;
+
+		if (minValue > maxValue)
+		{
+			(minValue, maxValue) = (maxValue, minValue); // swap
+		}
+
+		if (minValue >= 0 && maxValue >= 0)
+		{
+			return NarrowMax((ulong)maxValue).NarrowMin((ulong)minValue);
+		}
+		else if (minValue < 0 && maxValue < 0)
+		{
+			return NarrowMin((ulong)maxValue).NarrowMax((ulong)minValue);
+		}
+
+		// unable to narrow
+
+		return this;
+	}
+
 	public BitValue NarrowSetBits(ulong bitsSet)
 	{
 		if (IsFixed)
@@ -322,11 +346,11 @@ public override string ToString()
 	{
 		var sb = new StringBuilder();
 
-		sb.Append($"MaxValue: {MaxValue}");
-		sb.Append($"MinValue: {MinValue}");
-		sb.Append($"BitsSet: {Convert.ToString((long)BitsSet, 2).PadLeft(64, '0')}");
-		sb.Append($"BitsClear: {Convert.ToString((long)BitsClear, 2).PadLeft(64, '0')}");
-		sb.Append($"BitsKnown: {Convert.ToString((long)BitsKnown, 2).PadLeft(64, '0')}");
+		sb.AppendLine($" Min: {MinValue}");
+		sb.AppendLine($" Max: {MaxValue}");
+		sb.AppendLine($" BitsSet:   {Convert.ToString((long)BitsSet, 2).PadLeft(64, '0')}");
+		sb.AppendLine($" BitsClear: {Convert.ToString((long)BitsClear, 2).PadLeft(64, '0')}");
+		sb.AppendLine($" BitsKnown: {Convert.ToString((long)BitsKnown, 2).PadLeft(64, '0')}");
 
 		return sb.ToString();
 	}

diff --git a/Source/Mosa.Compiler.Framework/Compiler.cs b/Source/Mosa.Compiler.Framework/Compiler.cs
@@ -161,14 +161,14 @@ public sealed class Compiler
 		mosaSettings.SparseConditionalConstantPropagation && mosaSettings.SSA ? new SparseConditionalConstantPropagationStage() : null,
 		mosaSettings.BasicOptimizations && mosaSettings.SSA && (mosaSettings.ValueNumbering || mosaSettings.LoopInvariantCodeMotion || mosaSettings.SparseConditionalConstantPropagation) ? new OptimizationStage(false) : null,
 		mosaSettings.BitTracker ? new BitTrackerStage() : null,
-		//mosaSettings.LoopRangeTracker && mosaSettings.SSA ? new LoopRangeTrackerStage() : null,
+		mosaSettings.LoopRangeTracker && mosaSettings.SSA ? new LoopRangeTrackerStage() : null,
 		mosaSettings.BasicOptimizations  ? new OptimizationStage(mosaSettings.LongExpansion) : null,
 
 		mosaSettings.TwoPassOptimization && mosaSettings.ValueNumbering && mosaSettings.SSA ? new ValueNumberingStage() : null,
 		mosaSettings.TwoPassOptimization && mosaSettings.LoopInvariantCodeMotion && mosaSettings.SSA ? new LoopInvariantCodeMotionStage() : null,
 		mosaSettings.TwoPassOptimization && mosaSettings.SparseConditionalConstantPropagation && mosaSettings.SSA ? new SparseConditionalConstantPropagationStage() : null,
 		mosaSettings.TwoPassOptimization && mosaSettings.BitTracker ? new BitTrackerStage() : null,
-		//mosaSettings.TwoPassOptimization && mosaSettings.LoopRangeTracker && mosaSettings.SSA ? new LoopRangeTrackerStage() : null,
+		mosaSettings.TwoPassOptimization && mosaSettings.LoopRangeTracker && mosaSettings.SSA ? new LoopRangeTrackerStage() : null,
 		mosaSettings.TwoPassOptimization && mosaSettings.BasicOptimizations && mosaSettings.SSA ? new OptimizationStage(mosaSettings.LongExpansion) : null,
 
 		new NopRemovalStage(),

diff --git a/Source/Mosa.Compiler.Framework/Loop.cs b/Source/Mosa.Compiler.Framework/Loop.cs
@@ -9,7 +9,6 @@ public sealed class Loop
 	public BasicBlock Header { get; set; }
 	public readonly List<BasicBlock> Backedges = new();
 	public readonly List<BasicBlock> LoopBlocks = new();
-	//private readonly HashSet<BasicBlock> LoopBlocksSet = new();
 
 	public Loop(BasicBlock header, BasicBlock backedge)
 	{
@@ -26,11 +25,5 @@ public void AddNode(BasicBlock block)
 	{
 		Debug.Assert(!LoopBlocks.Contains(block));
 		LoopBlocks.Add(block);
-		//LoopBlocksSet.Add(block);
 	}
-
-	//public bool Contains(BasicBlock block)
-	//{
-	//	return LoopBlocksSet.Contains(block);
-	//}
 }
diff --git a/Source/Mosa.Compiler.Framework/Operand.cs b/Source/Mosa.Compiler.Framework/Operand.cs
@@ -113,6 +113,27 @@ public bool IsConstantZero
 		}
 	}
 
+	public bool IsNegative
+	{
+		get
+		{
+			if (!IsResolvedConstant)
+				return false;
+			else if (IsLocalStack || IsOnStack || IsParameter)
+				return ConstantUnsigned64 < 0;
+			else if (IsNull)
+				return false;
+			else if (IsR8)
+				return ConstantDouble < 0;
+			else if (IsR4)
+				return ConstantFloat < 0;
+			else if (IsInt32)
+				return ConstantSigned32 < 0;
+			else
+				return ConstantSigned64 < 0;
+		}
+	}
+
 	public bool IsPhysicalRegister => Location == LocationType.PhysicalRegister;
 
 	public bool IsFloatingPoint => IsR4 | IsR8;

diff --git a/Source/Mosa.Compiler.Framework/Stages/BaseTransformStage.cs b/Source/Mosa.Compiler.Framework/Stages/BaseTransformStage.cs
@@ -275,9 +275,15 @@ private bool ApplyBlockTransforms()
 			var updated = count != 0;
 			changed |= updated;
 
-			if (updated && MethodCompiler.Statistics)
+			if (updated)
 			{
-				UpdateCounter(transform.Name, count);
+				MethodCompiler.CreateTranformInstructionTrace(this, Steps++);
+
+				if (MosaSettings.FullCheckMode)
+					FullCheck(false);
+
+				if (MethodCompiler.Statistics)
+					UpdateCounter(transform.Name, count);
 			}
 		}
 

diff --git a/...sa.Tool.Explorer/Stages/DebugInfoStage.cs → ...ework/Stages/Diagnostic/DebugInfoStage.cs b/...sa.Tool.Explorer/Stages/DebugInfoStage.cs → ...ework/Stages/Diagnostic/DebugInfoStage.cs
@@ -1,8 +1,6 @@
 // Copyright (c) MOSA Project. Licensed under the New BSD License.
 
-using Mosa.Compiler.Framework;
-
-namespace Mosa.Tool.Explorer.Stages;
+namespace Mosa.Compiler.Framework.Stages.Diagnostic;
 
 public class DebugInfoStage : BaseMethodCompilerStage
 {

diff --git a/...l.Explorer/Stages/DominanceOutputStage.cs → ...ages/Diagnostic/DominanceAnalysisStage.cs b/...l.Explorer/Stages/DominanceOutputStage.cs → ...ages/Diagnostic/DominanceAnalysisStage.cs
@@ -1,12 +1,11 @@
 // Copyright (c) MOSA Project. Licensed under the New BSD License.
 
 using System.Text;
-using Mosa.Compiler.Framework;
 using Mosa.Compiler.Framework.Analysis;
 
-namespace Mosa.Tool.Explorer.Stages;
+namespace Mosa.Compiler.Framework.Stages.Diagnostic;
 
-public class DominanceOutputStage : BaseMethodCompilerStage
+public class DominanceAnalysisStage : BaseMethodCompilerStage
 {
 	private const int TraceLevel = 5;
 

diff --git a/...osa.Tool.Explorer/Stages/GraphVizStage.cs → ...mework/Stages/Diagnostic/GraphVizStage.cs b/...osa.Tool.Explorer/Stages/GraphVizStage.cs → ...mework/Stages/Diagnostic/GraphVizStage.cs
@@ -1,8 +1,6 @@
 // Copyright (c) MOSA Project. Licensed under the New BSD License.
 
-using Mosa.Compiler.Framework;
-
-namespace Mosa.Tool.Explorer.Stages;
+namespace Mosa.Compiler.Framework.Stages.Diagnostic;
 
 public class GraphVizStage : BaseMethodCompilerStage
 {