From 9d7627af6484e090ebbc3209bc7301f0bdf47d24 Mon Sep 17 00:00:00 2001 From: FICTURE7 Date: Sun, 30 May 2021 01:06:28 +0400 Subject: Add multi-level function table (#2228) * Add AddressTable * Use AddressTable for dispatch * Remove JumpTable & co. * Add fallback for out of range addresses * Add PPTC support * Add documentation to `AddressTable` * Make AddressTable configurable * Fix table walk * Fix IsMapped check * Remove CountTableCapacity * Add PPTC support for fast path * Rename IsMapped to IsValid * Remove stale comment * Change format of address in exception message * Add TranslatorStubs * Split DispatchStub Avoids recompilation of stubs during tests. * Add hint for 64bit or 32bit * Add documentation to `Symbol` * Add documentation to `TranslatorStubs` Make `TranslatorStubs` disposable as well. * Add documentation to `SymbolType` * Add `AddressTableEventSource` to monitor function table size Add an EventSource which measures the amount of unmanaged bytes allocated by AddressTable instances. dotnet-counters monitor -n Ryujinx --counters ARMeilleure * Add `AllowLcqInFunctionTable` optimization toggle This is to reduce the impact this change has on the test duration. Before everytime a test was ran, the FunctionTable would be initialized and populated so that the newly compiled test would get registered to it. * Implement unmanaged dispatcher Uses the DispatchStub to dispatch into the next translation, which allows execution to stay in unmanaged for longer and skips a ConcurrentDictionary look up when the target translation has been registered to the FunctionTable. * Remove redundant null check * Tune levels of FunctionTable Uses 5 levels instead of 4 and change unit of AddressTableEventSource from KB to MB. * Use 64-bit function table Improves codegen for direct branches: mov qword [rax+0x408],0x10603560 - mov rcx,sub_10603560_OFFSET - mov ecx,[rcx] - mov ecx,ecx - mov rdx,JIT_CACHE_BASE - add rdx,rcx + mov rcx,sub_10603560 + mov rdx,[rcx] mov rcx,rax Improves codegen for dispatch stub: and rax,byte +0x1f - mov eax,[rcx+rax*4] - mov eax,eax - mov rcx,JIT_CACHE_BASE - lea rax,[rcx+rax] + mov rax,[rcx+rax*8] mov rcx,rbx * Remove `JitCacheSymbol` & `JitCache.Offset` * Turn `Translator.Translate` into an instance method We do not have to add more parameter to this method and related ones as new structures are added & needed for translation. * Add symbol only when PTC is enabled Address LDj3SNuD's feedback * Change `NativeContext.Running` to a 32-bit integer * Fix PageTable symbol for host mapped --- .../EventSources/AddressTableEventSource.cs | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 ARMeilleure/Diagnostics/EventSources/AddressTableEventSource.cs (limited to 'ARMeilleure/Diagnostics/EventSources/AddressTableEventSource.cs') diff --git a/ARMeilleure/Diagnostics/EventSources/AddressTableEventSource.cs b/ARMeilleure/Diagnostics/EventSources/AddressTableEventSource.cs new file mode 100644 index 00000000..201a2562 --- /dev/null +++ b/ARMeilleure/Diagnostics/EventSources/AddressTableEventSource.cs @@ -0,0 +1,51 @@ +using System.Diagnostics.Tracing; + +namespace ARMeilleure.Diagnostics.EventSources +{ + [EventSource(Name = "ARMeilleure")] + class AddressTableEventSource : EventSource + { + public static readonly AddressTableEventSource Log = new(); + + private ulong _size; + private ulong _leafSize; + private PollingCounter _sizeCounter; + private PollingCounter _leafSizeCounter; + + public AddressTableEventSource() + { + _sizeCounter = new PollingCounter("addr-tab-alloc", this, () => _size / 1024d / 1024d) + { + DisplayName = "AddressTable Total Bytes Allocated", + DisplayUnits = "MB" + }; + + _leafSizeCounter = new PollingCounter("addr-tab-leaf-alloc", this, () => _leafSize / 1024d / 1024d) + { + DisplayName = "AddressTable Total Leaf Bytes Allocated", + DisplayUnits = "MB" + }; + } + + public void Allocated(int bytes, bool leaf) + { + _size += (uint)bytes; + + if (leaf) + { + _leafSize += (uint)bytes; + } + } + + protected override void Dispose(bool disposing) + { + _leafSizeCounter.Dispose(); + _leafSizeCounter = null; + + _sizeCounter.Dispose(); + _sizeCounter = null; + + base.Dispose(disposing); + } + } +} -- cgit v1.2.3