Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Optimize stlod ldloc #614

Merged
merged 1 commit into from Dec 12, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 20 additions & 0 deletions Xamarin.Forms.Build.Tasks/MethodBodyExtensions.cs
Expand Up @@ -12,6 +12,7 @@ public static void Optimize(this MethodBody self)
throw new ArgumentNullException(nameof(self));

self.OptimizeLongs();
self.OptimizeStLdLoc();
self.OptimizeMacros();
}

Expand All @@ -36,5 +37,24 @@ static void OptimizeLongs(this MethodBody self)
self.Instructions.Insert(++i, Instruction.Create(OpCodes.Conv_I8));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're only going to iterate through every other instruction if you do ++i here. Is that intentional?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

btw, this was part of a preview PR, and was only moved in this

}
}

static void OptimizeStLdLoc(this MethodBody self)
{
var method = self.Method;
for (var i = 0; i < self.Instructions.Count; i++) {
var instruction = self.Instructions[i];
if (instruction.OpCode.Code != Code.Stloc)
continue;
if (i + 1 >= self.Instructions.Count)
continue;
var next = self.Instructions[i + 1];
int num = ((VariableDefinition)instruction.Operand).Index;
var vardef = instruction.Operand;
if (next.OpCode.Code != Code.Ldloc || num != ((VariableDefinition)next.Operand).Index)
continue;
ExpandMacro(instruction, OpCodes.Dup, null);
ExpandMacro(next, OpCodes.Stloc, vardef);
}
}
}
}
2 changes: 1 addition & 1 deletion Xamarin.Forms.Xaml.Xamlc/Xamarin.Forms.Xaml.Xamlc.csproj
Expand Up @@ -17,7 +17,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Externalconsole>true</Externalconsole>
<Commandlineparameters>-r "../../../Xamarin.Forms.Controls/bin/Debug/" -p "../../../Xamarin.Forms.Xaml.UnitTest/bin/Debug/;/Library/Frameworks/Mono.framework/Versions/3.12.1/lib/mono/4.5;/Library/Frameworks/Mono.framework/Versions/3.12.1/lib/mono/4.5/Facades/" --keep -v 4 ../../../Xamarin.Forms.Xaml.UnitTests/bin/Debug/Xamarin.Forms.Xaml.UnitTests.dll</Commandlineparameters>
<Commandlineparameters>-r "../../../Xamarin.Forms.Controls/bin/Debug/" -p "../../../Xamarin.Forms.Xaml.UnitTest/bin/Debug/;/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.5;/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/4.5/Facades/" --keep -v 4 ../../../Xamarin.Forms.Xaml.UnitTests/bin/Debug/Xamarin.Forms.Xaml.UnitTests.dll</Commandlineparameters>
<AssemblyName>xamlc</AssemblyName>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
Expand Down