diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2021-02-07 20:25:14 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-08 10:25:14 +1100 |
| commit | ee28ccebf4e8a2ad84c2fcba2d6436473103def8 (patch) | |
| tree | fb0e2253eea28931291b77ba428b9ef18fbde509 /ARMeilleure | |
| parent | 7016d95eb17ee572fd6fe373f2b4c05e4a576dd6 (diff) | |
Disable partial JIT invalidation on unmap (#1991)
Diffstat (limited to 'ARMeilleure')
| -rw-r--r-- | ARMeilleure/Translation/TranslatedFunction.cs | 5 | ||||
| -rw-r--r-- | ARMeilleure/Translation/Translator.cs | 50 |
2 files changed, 26 insertions, 29 deletions
diff --git a/ARMeilleure/Translation/TranslatedFunction.cs b/ARMeilleure/Translation/TranslatedFunction.cs index 54c050f6..8b075928 100644 --- a/ARMeilleure/Translation/TranslatedFunction.cs +++ b/ARMeilleure/Translation/TranslatedFunction.cs @@ -33,5 +33,10 @@ namespace ARMeilleure.Translation { return !HighCq && Interlocked.Increment(ref _callCount) == MinCallsForRejit; } + + public void ResetCallCount() + { + Interlocked.Exchange(ref _callCount, 0); + } } }
\ No newline at end of file diff --git a/ARMeilleure/Translation/Translator.cs b/ARMeilleure/Translation/Translator.cs index 2c32e9f0..ac96475f 100644 --- a/ARMeilleure/Translation/Translator.cs +++ b/ARMeilleure/Translation/Translator.cs @@ -390,33 +390,10 @@ namespace ARMeilleure.Translation public void InvalidateJitCacheRegion(ulong address, ulong size) { - static bool OverlapsWith(ulong funcAddress, ulong funcSize, ulong address, ulong size) - { - return funcAddress < address + size && address < funcAddress + funcSize; - } - - // Make a copy of all overlapping functions, as we can't otherwise - // remove elements from the collection we are iterating. - // Doing that before clearing the rejit queue is fine, even - // if a function is translated after this, it would only replace - // a existing function, as rejit is only triggered on functions - // that were already executed before. - var toDelete = _funcs.Where(x => OverlapsWith(x.Key, x.Value.GuestSize, address, size)).ToArray(); - - if (toDelete.Length != 0) - { - // If rejit is running, stop it as it may be trying to rejit the functions we are - // supposed to remove. - ClearRejitQueue(); - } + // If rejit is running, stop it as it may be trying to rejit a function on the invalidated region. + ClearRejitQueue(allowRequeue: true); - foreach (var kv in toDelete) - { - if (_funcs.TryRemove(kv.Key, out TranslatedFunction func)) - { - EnqueueForDeletion(kv.Key, func); - } - } + // TODO: Completely remove functions overlapping the specified range from the cache. } private void EnqueueForDeletion(ulong guestAddress, TranslatedFunction func) @@ -427,7 +404,7 @@ namespace ARMeilleure.Translation private void ClearJitCache() { // Ensure no attempt will be made to compile new functions due to rejit. - ClearRejitQueue(); + ClearRejitQueue(allowRequeue: false); foreach (var kv in _funcs) { @@ -442,10 +419,25 @@ namespace ARMeilleure.Translation } } - private void ClearRejitQueue() + private void ClearRejitQueue(bool allowRequeue) { _backgroundTranslatorLock.AcquireWriterLock(Timeout.Infinite); - _backgroundStack.Clear(); + + if (allowRequeue) + { + while (_backgroundStack.TryPop(out var request)) + { + if (_funcs.TryGetValue(request.Address, out var func)) + { + func.ResetCallCount(); + } + } + } + else + { + _backgroundStack.Clear(); + } + _backgroundTranslatorLock.ReleaseWriterLock(); } } |