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

Jump to bottom

Armeilleure: Fix support for Windows on ARM64 #5202

Merged
merged 2 commits into from Jun 3, 2023
Merged

Armeilleure: Fix support for Windows on ARM64 #5202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f66a9f1
Armeilleure: Fix support for Windows on ARM64
marysaka Jun 2, 2023
2698b02
Address gdkchan's comments
marysaka Jun 2, 2023
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
22 changes: 19 additions & 3 deletions src/ARMeilleure/Translation/Cache/JitCache.cs
View file
Open in desktop
Expand Up @@ -6,10 +6,11 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;

namespace ARMeilleure.Translation.Cache
{
static class JitCache
static partial class JitCache
{
private const int PageSize = 4 * 1024;
private const int PageMask = PageSize - 1;
Expand All @@ -27,6 +28,10 @@ static class JitCache
private static readonly object _lock = new object();
private static bool _initialized;

[SupportedOSPlatform("windows")]
[LibraryImport("kernel32.dll", SetLastError = true)]
public static partial IntPtr FlushInstructionCache(IntPtr hProcess, IntPtr lpAddress, UIntPtr dwSize);

public static void Initialize(IJitMemoryAllocator allocator)
{
if (_initialized) return;
Expand All @@ -36,7 +41,11 @@ public static void Initialize(IJitMemoryAllocator allocator)
if (_initialized) return;

_jitRegion = new ReservedRegion(allocator, CacheSize);
_jitCacheInvalidator = new JitCacheInvalidation(allocator);

if (!OperatingSystem.IsWindows() && !OperatingSystem.IsMacOS())
{
_jitCacheInvalidator = new JitCacheInvalidation(allocator);
}

_cacheAllocator = new CacheMemoryAllocator(CacheSize);

Expand Down Expand Up @@ -77,7 +86,14 @@ public static IntPtr Map(CompiledFunction func)
Marshal.Copy(code, 0, funcPtr, code.Length);
ReprotectAsExecutable(funcOffset, code.Length);

_jitCacheInvalidator.Invalidate(funcPtr, (ulong)code.Length);
if (OperatingSystem.IsWindows() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
{
FlushInstructionCache(Process.GetCurrentProcess().Handle, funcPtr, (UIntPtr)code.Length);
}
else
{
_jitCacheInvalidator?.Invalidate(funcPtr, (ulong)code.Length);
}
}

Add(funcOffset, code.Length, func.UnwindInfo);
Expand Down
4 changes: 2 additions & 2 deletions src/ARMeilleure/Translation/Cache/JitCacheInvalidation.cs
View file
Open in desktop
Expand Up @@ -47,8 +47,8 @@ class JitCacheInvalidation

public JitCacheInvalidation(IJitMemoryAllocator allocator)
{
// On macOS, a different path is used to write to the JIT cache, which does the invalidation.
if (!OperatingSystem.IsMacOS() && RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
// On macOS and Windows, a different path is used to write to the JIT cache, which does the invalidation.
if (RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
{
ulong size = (ulong)_invalidationCode.Length * sizeof(int);
ulong mask = (ulong)ReservedRegion.DefaultGranularity - 1;
Expand Down