From 68f6b79fd3f06ea572d5f0edd5fc8cbaee1ae449 Mon Sep 17 00:00:00 2001 From: LDj3SNuD <35856442+LDj3SNuD@users.noreply.github.com> Date: Tue, 12 Jan 2021 19:04:02 +0100 Subject: Add a simple Pools Limiter. (#1830) * Added support for offline invalidation, via PPTC, of low cq translations replaced by high cq translations; both on a single run and between runs. Added invalidation of .cache files in the event of reuse on a different user operating system. Added .info and .cache files invalidation in case of a failed stream decompression. Nits. * InternalVersion = 1712; * Nits. * Address comment. * Get rid of BinaryFormatter. Nits. * Move Ptc.LoadTranslations(). Nits. * Nits. * Fixed corner cases (in case backup copies have to be used). Added save logs. * Not core fixes. * Complement to the previous commit. Added load logs. Removed BinaryFormatter leftovers. * Add LoadTranslations log. * Nits. * Removed the search and management of LowCq overlapping functions. * Final increment of .info and .cache flags. * Nit. * Free up memory allocated by Pools during any PPTC translations at boot time. * Nit due to rebase. * Add a simple Pools Limiter. * Nits. * Fix missing JumpTable.RegisterFunction() due to rebase. Clear MemoryStreams as soon as possible, when they are no longer needed. * Code cleaning. * Nit for retrigger Checks. * Update Ptc.cs * Contextual refactoring of Translator. Ignore resetting of pools for DirectCallStubs. * Nit for retrigger Checks. --- ARMeilleure/Translation/DirectCallStubs.cs | 2 -- ARMeilleure/Translation/PTC/Ptc.cs | 16 ++++++++++----- ARMeilleure/Translation/Translator.cs | 31 +++++++++++++++++++----------- 3 files changed, 31 insertions(+), 18 deletions(-) (limited to 'ARMeilleure/Translation') diff --git a/ARMeilleure/Translation/DirectCallStubs.cs b/ARMeilleure/Translation/DirectCallStubs.cs index 57397d14..df7ca16e 100644 --- a/ARMeilleure/Translation/DirectCallStubs.cs +++ b/ARMeilleure/Translation/DirectCallStubs.cs @@ -34,8 +34,6 @@ namespace ARMeilleure.Translation _indirectCallStubPtr = Marshal.GetFunctionPointerForDelegate(GenerateIndirectCallStub(false)); _indirectTailCallStubPtr = Marshal.GetFunctionPointerForDelegate(GenerateIndirectCallStub(true)); - Translator.ResetPools(); - _initialized = true; } } diff --git a/ARMeilleure/Translation/PTC/Ptc.cs b/ARMeilleure/Translation/PTC/Ptc.cs index f382cc63..8f250a55 100644 --- a/ARMeilleure/Translation/PTC/Ptc.cs +++ b/ARMeilleure/Translation/PTC/Ptc.cs @@ -98,7 +98,6 @@ namespace ARMeilleure.Translation.PTC ClearMemoryStreams(); PtcJumpTable.Clear(); - PtcProfiler.Stop(); PtcProfiler.Wait(); PtcProfiler.ClearEntries(); @@ -345,6 +344,8 @@ namespace ARMeilleure.Translation.PTC private static void Save(string fileName) { + int translatedFuncsCount; + using (MemoryStream stream = new MemoryStream()) using (MD5 md5 = MD5.Create()) { @@ -361,6 +362,11 @@ namespace ARMeilleure.Translation.PTC PtcJumpTable.Serialize(stream, PtcJumpTable); + translatedFuncsCount = GetInfosEntriesCount(); + + ClearMemoryStreams(); + PtcJumpTable.Clear(); + stream.Seek((long)hashSize, SeekOrigin.Begin); byte[] hash = md5.ComputeHash(stream); @@ -388,7 +394,7 @@ namespace ARMeilleure.Translation.PTC long fileSize = new FileInfo(fileName).Length; - Logger.Info?.Print(LogClass.Ptc, $"Saved Translation Cache (size: {fileSize} bytes, translated functions: {GetInfosEntriesCount()})."); + Logger.Info?.Print(LogClass.Ptc, $"Saved Translation Cache (size: {fileSize} bytes, translated functions: {translatedFuncsCount})."); } private static void WriteHeader(MemoryStream stream) @@ -709,10 +715,10 @@ namespace ARMeilleure.Translation.PTC threads.Clear(); - _loggerEvent.Set(); - Translator.ResetPools(); + _loggerEvent.Set(); + PtcJumpTable.Initialize(jumpTable); PtcJumpTable.ReadJumpTable(jumpTable); @@ -736,7 +742,7 @@ namespace ARMeilleure.Translation.PTC Logger.Info?.Print(LogClass.Ptc, $"{_translateCount} of {profiledFuncsToTranslateCount} functions translated"); } - internal static void WriteInfoCodeReloc(ulong address, ulong guestSize, bool highCq, PtcInfo ptcInfo) + internal static void WriteInfoCodeRelocUnwindInfo(ulong address, ulong guestSize, bool highCq, PtcInfo ptcInfo) { lock (_lock) { diff --git a/ARMeilleure/Translation/Translator.cs b/ARMeilleure/Translation/Translator.cs index 612f6647..2c32e9f0 100644 --- a/ARMeilleure/Translation/Translator.cs +++ b/ARMeilleure/Translation/Translator.cs @@ -201,15 +201,14 @@ namespace ARMeilleure.Translation { ArmEmitterContext context = new ArmEmitterContext(memory, jumpTable, address, highCq, Aarch32Mode.User); - PrepareOperandPool(highCq); - PrepareOperationPool(highCq); - Logger.StartPass(PassName.Decoding); Block[] blocks = Decoder.Decode(memory, address, mode, highCq, singleBlock: false); Logger.EndPass(PassName.Decoding); + PreparePool(highCq); + Logger.StartPass(PassName.Translation); EmitSynchronization(context); @@ -240,21 +239,31 @@ namespace ARMeilleure.Translation if (Ptc.State == PtcState.Disabled) { func = Compiler.Compile(cfg, argTypes, OperandType.I64, options); + + ReturnPool(highCq); } - else + else using (PtcInfo ptcInfo = new PtcInfo()) { - using (PtcInfo ptcInfo = new PtcInfo()) - { - func = Compiler.Compile(cfg, argTypes, OperandType.I64, options, ptcInfo); + func = Compiler.Compile(cfg, argTypes, OperandType.I64, options, ptcInfo); - Ptc.WriteInfoCodeReloc(address, funcSize, highCq, ptcInfo); - } + ReturnPool(highCq); + + Ptc.WriteInfoCodeRelocUnwindInfo(address, funcSize, highCq, ptcInfo); } + return new TranslatedFunction(func, funcSize, highCq); + } + + internal static void PreparePool(bool highCq) + { + PrepareOperandPool(highCq); + PrepareOperationPool(highCq); + } + + internal static void ReturnPool(bool highCq) + { ReturnOperandPool(highCq); ReturnOperationPool(highCq); - - return new TranslatedFunction(func, funcSize, highCq); } internal static void ResetPools() -- cgit v1.2.3