Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated NuGet packages #1220

Merged
merged 1 commit into from
Apr 17, 2024
Merged

Updated NuGet packages #1220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions Source/Mosa.Compiler.Common.xUnit/Mosa.Compiler.Common.xUnit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
18 changes: 9 additions & 9 deletions Source/Mosa.Compiler.Framework.xUnit/Mosa.Compiler.Framework.xUnit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Source/Mosa.Compiler.Framework/Analysis/LoopDetector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
7 changes: 0 additions & 7 deletions Source/Mosa.Compiler.Framework/Loop.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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);
//}
}
4 changes: 1 addition & 3 deletions ...sa.Tool.Explorer/Stages/DebugInfoStage.cs → ...ework/Stages/Diagnostic/DebugInfoStage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
5 changes: 2 additions & 3 deletions ...l.Explorer/Stages/DominanceOutputStage.cs → ...ages/Diagnostic/DominanceAnalysisStage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
4 changes: 1 addition & 3 deletions ...osa.Tool.Explorer/Stages/GraphVizStage.cs → ...mework/Stages/Diagnostic/GraphVizStage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
63 changes: 63 additions & 0 deletions Source/Mosa.Compiler.Framework/Stages/Diagnostic/LoopAnalysisStage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
// Copyright (c) MOSA Project. Licensed under the New BSD License.

using Mosa.Compiler.Framework.Analysis;

namespace Mosa.Compiler.Framework.Stages.Diagnostic;

/// <summary>
/// Loop Analysis Stage
/// </summary>
public sealed class LoopAnalysisStage : BaseMethodCompilerStage
{
private readonly Counter LoopCount = new("LoopAnalysis.LoopCount");
private readonly Counter LoopSize1 = new("LoopAnalysis.LoopSize-1");
private readonly Counter LoopSize2 = new("LoopAnalysis.LoopSize-2");
private readonly Counter LoopSize3 = new("LoopAnalysis.LoopSize-3");
private readonly Counter LoopSize4 = new("LoopAnalysis.LoopSize-4");
private readonly Counter LoopSize5Plus = new("LoopAnalysis.LoopSize-5+");

protected override void Initialize()
{
Register(LoopCount);
Register(LoopSize1);
Register(LoopSize2);
Register(LoopSize3);
Register(LoopSize4);
Register(LoopSize5Plus);
}

protected override void Run()
{
if (HasProtectedRegions)
return;

// Method is empty - must be a plugged method
if (BasicBlocks.HeadBlocks.Count != 1)
return;

if (BasicBlocks.PrologueBlock == null)
return;

if (!MethodCompiler.IsInSSAForm)
return;

var loops = LoopDetector.FindLoops(BasicBlocks);

LoopCount.Set(loops.Count);

foreach (var loop in loops)
{
var size = loop.LoopBlocks.Count;

switch (size)
{
case 1: LoopSize1.Increment(); break;
case 2: LoopSize2.Increment(); break;
case 3: LoopSize3.Increment(); break;
case 4: LoopSize4.Increment(); break;
default:
LoopSize5Plus.Increment(); break;
}
}
}
}
2 changes: 1 addition & 1 deletion Source/Mosa.Compiler.MosaTypeSystem.CLR/Mosa.Compiler.MosaTypeSystem.CLR.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="dnlib" Version="4.3.0" />
<PackageReference Include="dnlib" Version="4.4.0" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions Source/Mosa.Tool.Bootstrap/Mosa.Tool.Bootstrap.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Avalonia.Desktop" Version="11.0.9" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.9" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.9" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.10" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.10" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.10" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion Source/Mosa.Tool.Debugger/Mosa.Tool.Debugger.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="dnlib" Version="4.3.0" />
<PackageReference Include="dnlib" Version="4.4.0" />
</ItemGroup>

<ItemGroup>
Expand Down
9 changes: 3 additions & 6 deletions Source/Mosa.Tool.Explorer/MainForm.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using Mosa.Compiler.Framework;
using Mosa.Compiler.Framework.CompilerStages;
using Mosa.Compiler.Framework.Stages;
using Mosa.Compiler.Framework.Stages.Diagnostic;
using Mosa.Compiler.MosaTypeSystem;
using Mosa.Compiler.MosaTypeSystem.CLR;
using Mosa.Tool.Explorer.Stages;
Expand Down Expand Up @@ -573,12 +574,8 @@ private void ExtendMethodCompilerPipeline(Pipeline<BaseMethodCompilerStage> pipe
pipeline.Add(new DisassemblyStage());
pipeline.Add(new DebugInfoStage());

//pipeline.InsertBefore<GreedyRegisterAllocatorStage>(new StopStage());
//pipeline.InsertBefore<EnterSSAStage>(new DominanceOutputStage());
//pipeline.InsertBefore<EnterSSAStage>(new GraphVizStage());
//pipeline.InsertAfterLast<IRTransformsStage>(new GraphVizStage());

//pipeline.InsertAfterFirst<ExceptionStage>(new StopStage());
pipeline.InsertAfterLast<FastBlockOrderingStage>(new LoopAnalysisStage());
pipeline.InsertAfterLast<FastBlockOrderingStage>(new DominanceAnalysisStage());

if (cbEnableDebugDiagnostic.Checked)
{
Expand Down
2 changes: 1 addition & 1 deletion Source/Mosa.Tool.Explorer/Mosa.Tool.Explorer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<ItemGroup>
<PackageReference Include="System.ComponentModel.Composition" Version="8.0.0" />
<PackageReference Include="dnlib" Version="4.3.0" />
<PackageReference Include="dnlib" Version="4.4.0" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Source/Mosa.Tool.Launcher/Mosa.Tool.Launcher.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Avalonia.Desktop" Version="11.0.9" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.9" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.9" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.10" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.10" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.10" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion Source/Mosa.Utility.Disassembler/Mosa.Utility.Disassembler.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<ItemGroup>
<PackageReference Include="Reko.Decompiler.Runtime" Version="0.11.4" />
<PackageReference Include="Reko.Decompiler.Runtime" Version="0.11.5" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading