X86 Optimizations (#869)

* - Slight optimization that merges more empty block * - New x86 optimizations (add 1 -> inc, sub 1 -> dec) - Added SetNop() method on Context and Node
mosa · Sep 8, 2021 · daafbb1 · daafbb1
1 parent 906f878
commit daafbb1
Show file tree

Hide file tree

Showing 51 changed files with 180 additions and 78 deletions.
diff --git a/Source/Data/X86-Instructions.json b/Source/Data/X86-Instructions.json
@@ -563,7 +563,7 @@
 			"FlagsUnchanged": "C",
 			"FlagsUndefined": "",
 			"FlagsUsed": "",
-			"OperandCount": 2,
+			"OperandCount": 1,
 			"ResultCount": 1,
 			"ThreeTwoAddressConversion": "true",
 			"OpcodeEncoding": [
@@ -792,7 +792,7 @@
 			"FlagsUnchanged": "C",
 			"FlagsUndefined": "",
 			"FlagsUsed": "",
-			"OperandCount": 2,
+			"OperandCount": 1,
 			"ResultCount": 1,
 			"ThreeTwoAddressConversion": "false",
 			"OpcodeEncoding": [

diff --git a/Source/Mosa.Compiler.Framework/BaseMethodCompilerStage.cs b/Source/Mosa.Compiler.Framework/BaseMethodCompilerStage.cs
@@ -564,7 +564,7 @@ protected static bool EmptyBlockOfAllInstructions(BasicBlock block, bool useNop
 					continue;
 				}
 
-				node.SetInstruction(IRInstruction.Nop);
+				node.SetNop();
 
 				found = true;
 			}

diff --git a/Source/Mosa.Compiler.Framework/Context.cs b/Source/Mosa.Compiler.Framework/Context.cs
@@ -206,6 +206,11 @@ public Context(BasicBlock block)
 
 		#region Methods
 
+		public void SetNop()
+		{
+			Node.SetNop();
+		}
+
 		/// <summary>
 		/// Clones this instance.
 		/// </summary>

diff --git a/Source/Mosa.Compiler.Framework/InstructionNode.cs b/Source/Mosa.Compiler.Framework/InstructionNode.cs
@@ -1082,6 +1082,11 @@ public InstructionNode(BaseInstruction instruction, Operand result, Operand oper
 
 		#region SetInstructions
 
+		public void SetNop()
+		{
+			SetInstruction(IRInstruction.Nop);
+		}
+
 		/// <summary>
 		/// Sets the instruction.
 		/// </summary>

diff --git a/Source/Mosa.Compiler.Framework/Stages/BitTrackerStage.cs b/Source/Mosa.Compiler.Framework/Stages/BitTrackerStage.cs
@@ -561,7 +561,7 @@ private void UpdateInstruction(Operand virtualRegister, Value value)
 			Debug.Assert(virtualRegister.Uses.Count == 0);
 
 			trace?.Log($"REMOVED:\t{node}");
-			node.SetInstruction(IRInstruction.Nop);
+			node.SetNop();
 			trace?.Log();
 
 			InstructionsRemovedCount++;
@@ -595,7 +595,7 @@ private void UpdateBranchInstructions()
 				var newBranch = node.BranchTargets[0];
 
 				trace?.Log($"REMOVED:\t{node}");
-				node.SetInstruction(IRInstruction.Nop);
+				node.SetNop();
 				InstructionsRemovedCount++;
 				BranchesRemovedCount++;
 

diff --git a/Source/Mosa.Compiler.Framework/Stages/CILTransformationStage.cs b/Source/Mosa.Compiler.Framework/Stages/CILTransformationStage.cs
@@ -1242,7 +1242,7 @@ private void Newobj(Context context)
 		/// <param name="node">The context.</param>
 		private void Nop(InstructionNode node)
 		{
-			node.SetInstruction(IRInstruction.Nop);
+			node.SetNop();
 		}
 
 		/// <summary>
@@ -1280,7 +1280,7 @@ private void Pop(InstructionNode node)
 
 		private void PreReadOnly(Context context)
 		{
-			context.SetInstruction(IRInstruction.Nop);
+			context.SetNop();
 		}
 
 		/// <summary>

diff --git a/Source/Mosa.Compiler.Framework/Stages/SparseConditionalConstantPropagationStage.cs b/Source/Mosa.Compiler.Framework/Stages/SparseConditionalConstantPropagationStage.cs
@@ -124,7 +124,7 @@ protected void ReplaceVirtualRegisterWithConstant(Operand target, ulong value)
 			var defNode = target.Definitions[0];
 
 			trace?.Log($"REMOVED:\t{defNode}");
-			defNode.SetInstruction(IRInstruction.Nop);
+			defNode.SetNop();
 			InstructionsRemovedCount++;
 		}
 
@@ -159,7 +159,7 @@ protected void RemoveBranchesToDeadBlocks(BasicBlock deadBlock)
 					{
 						trace?.Log("*** RemoveBranchesToDeadBlocks");
 						trace?.Log($"REMOVED:\t{node}");
-						node.SetInstruction(IRInstruction.Nop);
+						node.SetNop();
 						InstructionsRemovedCount++;
 						continue;
 					}

diff --git a/Source/Mosa.Compiler.Framework/Stages/ValueNumberingStage.cs b/Source/Mosa.Compiler.Framework/Stages/ValueNumberingStage.cs
@@ -246,7 +246,7 @@ private void ValueNumber(BasicBlock block, out List<BasicBlock> nextblocks, out
 
 						trace?.Log($"Removed Unless PHI: {node}");
 
-						node.SetInstruction(IRInstruction.Nop);
+						node.SetNop();
 						InstructionRemovalCount++;
 						continue;
 					}
@@ -261,7 +261,7 @@ private void ValueNumber(BasicBlock block, out List<BasicBlock> nextblocks, out
 
 						trace?.Log($"Removed Redundant PHI: {node}");
 
-						node.SetInstruction(IRInstruction.Nop);
+						node.SetNop();
 						InstructionRemovalCount++;
 						continue;
 					}
@@ -297,7 +297,7 @@ private void ValueNumber(BasicBlock block, out List<BasicBlock> nextblocks, out
 					}
 
 					SetValueNumber(node.Result, node.Operand1);
-					node.SetInstruction(IRInstruction.Nop);
+					node.SetNop();
 					InstructionRemovalCount++;
 					continue;
 				}
@@ -332,7 +332,7 @@ private void ValueNumber(BasicBlock block, out List<BasicBlock> nextblocks, out
 					if (node.Instruction.IsParameterLoad)
 						ParameterLoadEliminationCount++;
 
-					node.SetInstruction(IRInstruction.Nop);
+					node.SetNop();
 					InstructionRemovalCount++;
 					SubexpressionEliminationCount++;
 					continue;

diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/ConstantFolding/Branch32.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/ConstantFolding/Branch32.cs
@@ -56,7 +56,7 @@ public override void Transform(Context context, TransformContext transformContex
 
 			if (!compare)
 			{
-				context.SetInstruction(IRInstruction.Nop);
+				context.SetNop();
 			}
 			else
 			{
@@ -68,7 +68,7 @@ public override void Transform(Context context, TransformContext transformContex
 				{
 					if (!context.IsEmptyOrNop)
 					{
-						context.SetInstruction(IRInstruction.Nop);
+						context.SetNop();
 					}
 					context.GotoNext();
 				}

diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/ConstantFolding/Branch64.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/ConstantFolding/Branch64.cs
@@ -55,7 +55,7 @@ public override void Transform(Context context, TransformContext transformContex
 
 			if (!compare)
 			{
-				context.SetInstruction(IRInstruction.Nop);
+				context.SetNop();
 			}
 			else
 			{
@@ -67,7 +67,7 @@ public override void Transform(Context context, TransformContext transformContex
 				{
 					if (!context.IsEmptyOrNop)
 					{
-						context.SetInstruction(IRInstruction.Nop);
+						context.SetNop();
 					}
 					context.GotoNext();
 				}

diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/ConstantFolding/BranchObject.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/ConstantFolding/BranchObject.cs
@@ -55,7 +55,7 @@ public override void Transform(Context context, TransformContext transformContex
 
 			if (!compare)
 			{
-				context.SetInstruction(IRInstruction.Nop);
+				context.SetNop();
 			}
 			else
 			{
@@ -67,7 +67,7 @@ public override void Transform(Context context, TransformContext transformContex
 				{
 					if (!context.IsEmptyOrNop)
 					{
-						context.SetInstruction(IRInstruction.Nop);
+						context.SetNop();
 					}
 					context.GotoNext();
 				}

diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/Memory/DoubleStoreParam32.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/Memory/DoubleStoreParam32.cs
@@ -26,7 +26,7 @@ public override bool Match(Context context, TransformContext transformContext)
 
 		public override void Transform(Context context, TransformContext transformContext)
 		{
-			context.SetInstruction(IRInstruction.Nop);
+			context.SetNop();
 		}
 	}
 }
diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/Memory/DoubleStoreParam64.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/Memory/DoubleStoreParam64.cs
@@ -26,7 +26,7 @@ public override bool Match(Context context, TransformContext transformContext)
 
 		public override void Transform(Context context, TransformContext transformContext)
 		{
-			context.SetInstruction(IRInstruction.Nop);
+			context.SetNop();
 		}
 	}
 }
diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/Memory/DoubleStoreParamR4.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/Memory/DoubleStoreParamR4.cs
@@ -26,7 +26,7 @@ public override bool Match(Context context, TransformContext transformContext)
 
 		public override void Transform(Context context, TransformContext transformContext)
 		{
-			context.SetInstruction(IRInstruction.Nop);
+			context.SetNop();
 		}
 	}
 }
diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/Memory/DoubleStoreParamR8.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/Memory/DoubleStoreParamR8.cs
@@ -26,7 +26,7 @@ public override bool Match(Context context, TransformContext transformContext)
 
 		public override void Transform(Context context, TransformContext transformContext)
 		{
-			context.SetInstruction(IRInstruction.Nop);
+			context.SetNop();
 		}
 	}
 }
diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/Memory/StoreLoadParam32.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/Memory/StoreLoadParam32.cs
@@ -26,7 +26,7 @@ public override bool Match(Context context, TransformContext transformContext)
 
 		public override void Transform(Context context, TransformContext transformContext)
 		{
-			context.SetInstruction(IRInstruction.Nop);
+			context.SetNop();
 		}
 	}
 }
diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/Memory/StoreLoadParam64.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/Memory/StoreLoadParam64.cs
@@ -26,7 +26,7 @@ public override bool Match(Context context, TransformContext transformContext)
 
 		public override void Transform(Context context, TransformContext transformContext)
 		{
-			context.SetInstruction(IRInstruction.Nop);
+			context.SetNop();
 		}
 	}
 }
diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/Memory/StoreLoadParamR4.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/Memory/StoreLoadParamR4.cs
@@ -26,7 +26,7 @@ public override bool Match(Context context, TransformContext transformContext)
 
 		public override void Transform(Context context, TransformContext transformContext)
 		{
-			context.SetInstruction(IRInstruction.Nop);
+			context.SetNop();
 		}
 	}
 }
diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/Memory/StoreLoadParamR8.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/Memory/StoreLoadParamR8.cs
@@ -26,7 +26,7 @@ public override bool Match(Context context, TransformContext transformContext)
 
 		public override void Transform(Context context, TransformContext transformContext)
 		{
-			context.SetInstruction(IRInstruction.Nop);
+			context.SetNop();
 		}
 	}
 }
diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/Simplification/Branch32OnlyOneExit.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/Simplification/Branch32OnlyOneExit.cs
@@ -21,7 +21,7 @@ public override void Transform(Context context, TransformContext transformContex
 			var target = context.BranchTargets[0];
 			var block = context.Block;
 
-			context.SetInstruction(IRInstruction.Nop);
+			context.SetNop();
 
 			TransformContext.RemoveBlockFromPHIInstructions(block, target);
 		}

diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/Simplification/Branch64OnlyOneExit.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/Simplification/Branch64OnlyOneExit.cs
@@ -21,7 +21,7 @@ public override void Transform(Context context, TransformContext transformContex
 			var target = context.BranchTargets[0];
 			var block = context.Block;
 
-			context.SetInstruction(IRInstruction.Nop);
+			context.SetNop();
 
 			TransformContext.RemoveBlockFromPHIInstructions(block, target);
 		}

diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/Simplification/BranchObjectOnlyOneExit.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/Simplification/BranchObjectOnlyOneExit.cs
@@ -18,7 +18,7 @@ public override bool Match(Context context, TransformContext transformContext)
 
 		public override void Transform(Context context, TransformContext transformContext)
 		{
-			context.SetInstruction(IRInstruction.Nop);
+			context.SetNop();
 
 			//context.SetInstruction(IRInstruction.Branch64, context.ConditionCode.GetReverse(), context.Result, context.Operand2, context.Operand1, context.BranchTargets[0]);
 		}

diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/Special/Deadcode.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/Special/Deadcode.cs
@@ -48,7 +48,7 @@ public override bool Match(Context context, TransformContext transformContext)
 
 		public override void Transform(Context context, TransformContext transformContext)
 		{
-			context.SetInstruction(IRInstruction.Nop);
+			context.SetNop();
 		}
 	}
 }
diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/Special/Move32Propagate.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/Special/Move32Propagate.cs
@@ -37,7 +37,7 @@ public override void Transform(Context context, TransformContext transformContex
 				}
 			}
 
-			context.SetInstruction(IRInstruction.Nop);
+			context.SetNop();
 		}
 	}
 }
diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/Special/Move32PropagateConstant.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/Special/Move32PropagateConstant.cs
@@ -37,7 +37,7 @@ public override void Transform(Context context, TransformContext transformContex
 				}
 			}
 
-			context.SetInstruction(IRInstruction.Nop);
+			context.SetNop();
 		}
 	}
 }
diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/Special/Move64Propagate.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/Special/Move64Propagate.cs
@@ -37,7 +37,7 @@ public override void Transform(Context context, TransformContext transformContex
 				}
 			}
 
-			context.SetInstruction(IRInstruction.Nop);
+			context.SetNop();
 		}
 	}
 }
diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/Special/Move64PropagateConstant.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/Special/Move64PropagateConstant.cs
@@ -37,7 +37,7 @@ public override void Transform(Context context, TransformContext transformContex
 				}
 			}
 
-			context.SetInstruction(IRInstruction.Nop);
+			context.SetNop();
 		}
 	}
 }
diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/Special/MoveCompoundPropagate.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/Special/MoveCompoundPropagate.cs
@@ -37,7 +37,7 @@ public override void Transform(Context context, TransformContext transformContex
 				}
 			}
 
-			context.SetInstruction(IRInstruction.Nop);
+			context.SetNop();
 		}
 	}
 }
diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/Special/MoveObjectPropagate.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/Special/MoveObjectPropagate.cs
@@ -37,7 +37,7 @@ public override void Transform(Context context, TransformContext transformContex
 				}
 			}
 
-			context.SetInstruction(IRInstruction.Nop);
+			context.SetNop();
 		}
 	}
 }
diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/Special/MoveObjectPropagateConstant.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/Special/MoveObjectPropagateConstant.cs
@@ -37,7 +37,7 @@ public override void Transform(Context context, TransformContext transformContex
 				}
 			}
 
-			context.SetInstruction(IRInstruction.Nop);
+			context.SetNop();
 		}
 	}
 }
diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/Special/MoveR4Propagate.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/Special/MoveR4Propagate.cs
@@ -37,7 +37,7 @@ public override void Transform(Context context, TransformContext transformContex
 				}
 			}
 
-			context.SetInstruction(IRInstruction.Nop);
+			context.SetNop();
 		}
 	}
 }
diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/Special/MoveR8Propagate.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/Special/MoveR8Propagate.cs
@@ -37,7 +37,7 @@ public override void Transform(Context context, TransformContext transformContex
 				}
 			}
 
-			context.SetInstruction(IRInstruction.Nop);
+			context.SetNop();
 		}
 	}
 }
diff --git a/Source/Mosa.Compiler.Framework/Transform/Manual/Special/Phi32Dead.cs b/Source/Mosa.Compiler.Framework/Transform/Manual/Special/Phi32Dead.cs
@@ -27,7 +27,7 @@ public override bool Match(Context context, TransformContext transformContext)
 
 		public override void Transform(Context context, TransformContext transformContext)
 		{
-			context.SetInstruction(IRInstruction.Nop);
+			context.SetNop();
 		}
 	}
 }