Re-enabled Loop Invariant Code Motion

Source/Mosa.Compiler.Framework/Analysis/LoopDetector.cs

@@ -1,6 +1,5 @@
 // Copyright (c) MOSA Project. Licensed under the New BSD License.
 
-using System.Collections;
 using Mosa.Compiler.Framework.Common;
 
 namespace Mosa.Compiler.Framework.Analysis;

Source/Mosa.Compiler.Framework/Analysis/SimpleTraceBlockOrder.cs

@@ -1,6 +1,5 @@
 // Copyright (c) MOSA Project. Licensed under the New BSD License.
 
-using System.Collections;
 using Mosa.Compiler.Framework.Common;
 
 namespace Mosa.Compiler.Framework.Analysis;
@@ -39,20 +38,24 @@ public override void Analyze(BasicBlocks basicBlocks)
 			{
 				var block = workList.Pop();
 
-				if (!referenced.Contains(block))
-				{
-					referenced.Add(block);
-					NewBlockOrder.Add(block);
+				if (referenced.Contains(block))
+					continue;
+
+				referenced.Add(block);
+				NewBlockOrder.Add(block);
 
-					var nextBlocks = new List<BasicBlock>(block.NextBlocks);
-					nextBlocks.Sort();
+				if (block.NextBlocks.Count == 0)
+					continue;
 
-					foreach (var successor in nextBlocks)
+				var nextBlocks = (block.NextBlocks.Count == 2 && block.NextBlocks[0].Label < block.NextBlocks[1].Label)
+					? new List<BasicBlock>() { block.NextBlocks[1], block.NextBlocks[0] }
+					: block.NextBlocks;
+
+				foreach (var successor in nextBlocks)
+				{
+					if (!referenced.Contains(successor))
 					{
-						if (!referenced.Contains(successor))
-						{
-							workList.Push(successor);
-						}
+						workList.Push(successor);
 					}
 				}
 			}

Source/Mosa.Compiler.Framework/Analysis/SparseConditionalConstantPropagation.cs

@@ -882,7 +882,7 @@ private void IntegerOperation1(Node node)
 
 		var operand1 = GetVariableState(node.Operand1);
 
-		if (operand1.IsOverDefined )
+		if (operand1.IsOverDefined)
 		{
 			UpdateToOverDefined(result);
 			return;
@@ -947,7 +947,6 @@ private static bool IntegerOperation1(BaseInstruction instruction, ulong operand
 		return false;
 	}
 
-
 	private void IntegerOperation2(Node node)
 	{
 		var result = GetVariableState(node.Result);

Source/Mosa.Compiler.Framework/BaseTransform.cs

@@ -1,6 +1,5 @@
 // Copyright (c) MOSA Project. Licensed under the New BSD License.
 
-using System.Diagnostics;
 using Mosa.Compiler.Common;
 using Mosa.Compiler.Common.Exceptions;
 

Source/Mosa.Compiler.Framework/BitValue.cs

@@ -3,7 +3,6 @@
 using System.Diagnostics;
 using System.Text;
 using Mosa.Compiler.Common;
-using Mosa.Compiler.Common.Configuration;
 
 namespace Mosa.Compiler.Framework;
 

Source/Mosa.Compiler.Framework/CodeEmitter.cs

@@ -1,7 +1,6 @@
 // Copyright (c) MOSA Project. Licensed under the New BSD License.
 
 using System.Diagnostics;
-using Mosa.Compiler.Common;
 using Mosa.Compiler.Framework.Linker;
 
 namespace Mosa.Compiler.Framework;

Source/Mosa.Compiler.Framework/Compiler.cs

@@ -143,8 +143,9 @@ public sealed class Compiler
 	{
 		new CILDecoderStage(),
 		new ExceptionStage(),
-		new IRTransformsStage(),
 		mosaSettings.Devirtualization ? new DevirtualizeCallStage() : null,
+		mosaSettings.BasicOptimizations ? new OptimizationStage(false) : null,
+		new IRTransformsStage(),
 		new PlugStage(),
 		new RuntimeStage(),
 

Source/Mosa.Compiler.Framework/CompilerStages/DebugFileStage.cs

@@ -1,7 +1,5 @@
 // Copyright (c) MOSA Project. Licensed under the New BSD License.
 
-using System.Reflection.Metadata;
-
 namespace Mosa.Compiler.Framework.CompilerStages;
 
 /// <summary>

Source/Mosa.Compiler.Framework/Node.cs

@@ -479,22 +479,6 @@ public void UpdateBranchTarget(int index, BasicBlock block)
 
 	#region Methods
 
-	/// <summary>
-	/// Clears this instance.
-	/// </summary>
-	private void Clear()
-	{
-		Label = -1;
-		Instruction = null;
-
-		ClearOperands();
-
-		ConditionCode = ConditionCode.Undefined;
-		Options = InstructionOption.None;
-		Block = null;
-		BranchTargets = null;
-	}
-
 	/// <summary>
 	/// Empties this node.
 	/// </summary>
@@ -507,8 +491,7 @@ public void Empty()
 		Instruction = null;
 		Block.RemoveBranchInstruction(this);
 		BranchTargets = null;
-
-		PhiBlocks?.Clear();
+		PhiBlocks = null;
 
 		if (AdditionalOperands != null)
 		{
@@ -1207,7 +1190,7 @@ public void SetInstruction(BaseInstruction instruction, int operandCount, int re
 		var label = Label;
 		var block = Block;
 
-		Clear();
+		Empty();
 
 		Instruction = instruction;
 		OperandCount = operandCount;

Source/Mosa.Compiler.Framework/OpcodeEncoder.cs

@@ -1,7 +1,6 @@
 // Copyright (c) MOSA Project. Licensed under the New BSD License.
 
 using System.Diagnostics;
-using System.Drawing;
 
 namespace Mosa.Compiler.Framework;
 

Source/Mosa.Compiler.Framework/Stages/BitTrackerStage.cs

@@ -2,7 +2,6 @@
 
 using System.Diagnostics;
 using Mosa.Compiler.Common;
-using Mosa.Compiler.Framework.Managers;
 
 namespace Mosa.Compiler.Framework.Stages;
 

Source/Mosa.Compiler.Framework/Stages/LoopInvariantCodeMotionStage.cs

@@ -1,6 +1,5 @@
 // Copyright (c) MOSA Project. Licensed under the New BSD License.
 
-using System.Collections;
 using System.Diagnostics;
 using System.Text;
 using Mosa.Compiler.Common;
@@ -135,17 +134,17 @@ private List<Node> FindLoopInvariantInstructions(Loop loop)
 			{
 				for (var node = block.AfterFirst; !node.IsBlockEndInstruction; node = node.Next)
 				{
-					if (node.IsEmpty)
+					if (node.IsEmptyOrNop)
 						continue;
 
-					// note - same code from ValueNumberingStage::CanAssignValueNumberToExpression()
+					// note - similar code in ValueNumberingStage::CanAssignValueNumberToExpression()
 					if (node.ResultCount != 1
 						|| node.OperandCount is 0 or > 2
 						|| node.Instruction.IsMemoryWrite
 						|| node.Instruction.IsIOOperation
 						|| node.Instruction.HasUnspecifiedSideEffect
 						|| node.Instruction.HasVariableOperands
-						|| node.Instruction.IsFlowNext
+						|| !node.Instruction.IsFlowNext
 						|| node.Instruction.IgnoreDuringCodeGeneration
 						|| node.Operand1.IsUnresolvedConstant
 						|| (node.OperandCount == 2 && node.Operand2.IsUnresolvedConstant)

Source/Mosa.Compiler.Framework/Stages/ValueNumberingStage.cs

@@ -464,7 +464,7 @@ private bool CanAssignValueNumberToExpression(Node node)
 			|| node.Instruction.IsIOOperation
 			|| node.Instruction.HasUnspecifiedSideEffect
 			|| node.Instruction.HasVariableOperands
-			|| node.Instruction.IsFlowNext
+			|| !node.Instruction.IsFlowNext
 			|| node.Instruction.IgnoreDuringCodeGeneration
 			|| node.Operand1.IsUnresolvedConstant
 			|| (node.OperandCount == 2 && node.Operand2.IsUnresolvedConstant))

Source/Mosa.Compiler.Framework/Transforms/Exception/ExceptionEnd.cs

@@ -28,7 +28,7 @@ public override void Transform(Context context, Transform transform)
 
 		var handler = FindNextEnclosingFinallyHandler(transform, immediate);
 
-		if (handler == null)
+		if (handler == null || handler.HandlerStart >= target.Label)
 		{
 			context.SetInstruction(IR.Jmp, target);
 			return;

Source/Mosa.Compiler.Framework/Transforms/Exception/ExceptionTransforms.cs

@@ -15,7 +15,7 @@ public static class ExceptionTransforms
 		new ExceptionStart(),
 		new ExceptionEnd(),
 		new Flow(),
-		new TryEnd(),
 		new TryStart(),
+		new TryEnd(),
 	};
 }

Source/Mosa.Compiler.Framework/Transforms/Exception/FinallyEnd.cs

@@ -64,22 +64,25 @@ public override void Transform(Context context, Transform transform)
 				var target = targets[i];
 				var conditionBlock = newBlocks[i + 1];
 
-				conditionBlock.AppendInstruction(transform.BranchInstruction, ConditionCode.Equal, null, leaveTargetRegister, Operand.CreateConstant32(target.Label), target);
-				conditionBlock.AppendInstruction(IR.Jmp, newBlocks[i + 2].Block);
+				if (next == null && i == targets.Count - 1)
+				{
+					conditionBlock.AppendInstruction(IR.Jmp, target);
+				}
+				else
+				{
+					conditionBlock.AppendInstruction(transform.BranchInstruction, ConditionCode.Equal, null, leaveTargetRegister, Operand.CreateConstant32(target.Label), target);
+					conditionBlock.AppendInstruction(IR.Jmp, newBlocks[i + 2].Block);
+				}
 			}
 		}
 
-		var finallyCallBlock = newBlocks[targetcount - 1];
-
 		if (next != null)
 		{
+			var finallyCallBlock = newBlocks[targetcount - 1];
+
 			finallyCallBlock.AppendInstruction(IR.MoveObject, transform.ExceptionRegister, Operand.NullObject);
 			finallyCallBlock.AppendInstruction(IR.MoveObject, transform.LeaveTargetRegister, leaveTargetRegister);
 			finallyCallBlock.AppendInstruction(IR.Jmp, transform.BasicBlocks.GetByLabel(next.HandlerStart));
 		}
-		else
-		{
-			// should be an unreachable block
-		}
 	}
 }

Source/Mosa.Compiler.Framework/Transforms/Exception/TryEnd.cs

@@ -34,7 +34,7 @@ public override void Transform(Context context, Transform transform)
 
 		var next = FindNextEnclosingFinallyHandler(transform, immediate);
 
-		if (next != null && next.HandlerEnd > immediate.HandlerEnd)
+		if (next != null && next.HandlerStart <= target.Label && next.HandlerEnd > immediate.HandlerEnd)
 		{
 			context.SetInstruction(IR.MoveObject, transform.LeaveTargetRegister, Operand.CreateConstant32(target.Label));
 			context.AppendInstruction(IR.MoveObject, transform.ExceptionRegister, Operand.NullObject);

Source/Mosa.Compiler.Framework/Transforms/Optimizations/Manual/CodeMotion/BaseCodeMotionTransform.cs

@@ -82,7 +82,7 @@ protected static Node GetMotionLocation(Node start, Node end, int window)
 
 				if (next.IsBlockEndInstruction
 					|| next.Instruction.IsMemoryWrite
-					|| next.Instruction.IsFlowNext
+					|| !next.Instruction.IsFlowNext
 					|| next.Instruction.HasUnspecifiedSideEffect)
 					return next;
 

Source/Mosa.Kernel.BareMetal/BitMap/BitMapIndexTable.cs

@@ -4,7 +4,7 @@
 
 namespace Mosa.Kernel.BareMetal;
 
-public struct BitMapIndexTable
+public readonly struct BitMapIndexTable
 {
 	private readonly Pointer Pointer;
 

Source/Mosa.Kernel.BareMetal/IPC/ServiceQueueRegistry.cs

@@ -6,7 +6,7 @@ namespace Mosa.Kernel.BareMetal.IPC;
 
 internal static class ServiceQueueRegistry
 {
-	public static List<MessageQueue> Queues = new List<MessageQueue>();
+	public static List<MessageQueue> Queues = new();
 
 	public static void Register(ServiceIdentification serviceID, MessageQueue queue)
 	{

Source/Mosa.Kernel.BareMetal/Messaging/Message.cs

@@ -0,0 +1,21 @@
+// Copyright (c) MOSA Project. Licensed under the New BSD License.
+
+namespace Mosa.Kernel.BareMetal.Messaging;
+
+internal struct Message
+{
+	public readonly ServiceIdentification ServiceIdentification;
+	public readonly object Data;
+	public readonly bool Direction;
+	public readonly uint Sequence;
+	public readonly Thread Thread;
+
+	public Message(ServiceIdentification serviceIdentification, object requestData, bool direction, Thread thread, uint sequence)
+	{
+		ServiceIdentification = serviceIdentification;
+		Data = requestData;
+		Direction = direction;
+		Thread = thread;
+		Sequence = sequence;
+	}
+}

Source/Mosa.Kernel.BareMetal/Messaging/MessageQueue.cs

@@ -0,0 +1,42 @@
+// Copyright (c) MOSA Project. Licensed under the New BSD License.
+
+using System.Collections.Generic;
+
+namespace Mosa.Kernel.BareMetal.Messaging;
+
+internal class MessageQueue
+{
+	public readonly string Name;
+
+	public readonly ServiceIdentification ServiceIdentification;
+
+	public readonly Thread Thread;
+
+	private readonly Queue<Message> Queue = new();
+
+	public MessageQueue(string name, ServiceIdentification serviceIdentification, Thread thread)
+	{
+		Name = name;
+		ServiceIdentification = serviceIdentification;
+		Thread = thread;
+	}
+
+	public void Add(Message message)
+	{
+		lock (this)
+		{
+			Queue.Enqueue(message);
+		}
+	}
+
+	//public Message Pop()
+	//{
+	//	lock (this)
+	//	{
+	//		if (Queue.Count == 0)
+	//			return null;
+
+	//		return Queue.Dequeue();
+	//	}
+	//}
+}

Source/Mosa.Kernel.BareMetal/Messaging/MessageSystem.cs

@@ -0,0 +1,26 @@
+// Copyright (c) MOSA Project. Licensed under the New BSD License.
+
+using System.Collections.Generic;
+
+namespace Mosa.Kernel.BareMetal.Messaging;
+
+internal static class MessageSystem
+{
+	public static Queue<Message> Queue = new();
+
+	public static void DeliverMessage(ServiceIdentification service, bool direction, object requestData)
+	{
+		var thread = Scheduler.GetCurrentThread();
+
+		// queue the message
+		lock (Queue)
+		{
+			Queue.Enqueue(new Message(service, requestData, direction, thread, 0));
+		}
+	}
+
+	public static void ProcessMessages()
+	{
+		//
+	}
+}