Merge pull request #7289 from mpirvu/disclaim

Options to enable memory disclaiming
eclipse · Mar 21, 2024 · 434db6e · 434db6e
2 parents 622e8ea + f21dd3e
commit 434db6e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/compiler/control/OMROptions.cpp b/compiler/control/OMROptions.cpp
@@ -299,6 +299,7 @@ TR::OptionTable OMR::Options::_jitOptions[] = {
    {"disableCrackedEdit",                 "O\tdisable cracking of edit/edit-and-mark", SET_OPTION_BIT(TR_DisableCrackedEditOptimization), "F" },
    {"disableCustomMethodHandleThunks",    "R\tdisable creation of custom invokeExact thunks for MethodHandles", SET_OPTION_BIT(TR_DisableCustomMethodHandleThunks), "F", NOT_IN_SUBSET},
    {"disableDAATrailingZeros",            "O\tdisable DAA trailing zero in byte array acceleration", SET_OPTION_BIT(TR_DisableDAATrailingZero), "F"},
+   {"disableDataCacheDisclaiming",        "M\tdisable memory disclaiming for data cache segments (linux specific).", SET_OPTION_BIT(TR_DisableDataCacheDisclaiming),"F", NOT_IN_SUBSET},
    {"disableDataCacheReclamation",        "I\tdisable the reaping of data caches when they are no longer needed.", SET_OPTION_BIT(TR_DisableDataCacheReclamation),"F", NOT_IN_SUBSET},
    {"disableDeadStoreBailOut",            "O\tdisable bail out of dead store", SET_OPTION_BIT(TR_DisableDeadStoreBailOut), "F"},
    {"disableDeadTreeElimination",         "O\tdisable dead tree elimination",                  TR::Options::disableOptimization, deadTreesElimination, 0, "P"},
@@ -403,6 +404,7 @@ TR::OptionTable OMR::Options::_jitOptions[] = {
    {"disableInvariantCodeMotion",           "O\tdisable invariant code motion.", SET_OPTION_BIT(TR_DisableInvariantCodeMotion), "P"},
    {"disableIPA",                          "O\tdisable inter procedural analysis.", SET_OPTION_BIT(TR_DisableIPA), "P"},
    {"disableIprofilerDataCollection",    "M\tdisables the collection of iprofiler information while maintaining the framework", SET_OPTION_BIT(TR_DisableIProfilerDataCollection), "F", NOT_IN_SUBSET},
+   {"disableIprofilerDataDisclaiming",     "M\tdisable memory disclaiming for IProfiler memory segments (linux specific).", SET_OPTION_BIT(TR_DisableIProfilerDataDisclaiming),"F", NOT_IN_SUBSET},
    {"disableIprofilerDataPersistence",     "M\tdisable storage of iprofile information in the shared cache", SET_OPTION_BIT(TR_DisablePersistIProfile), "F"},
    {"disableIsolatedSE",                  "O\tdisable isolated store elimination",             TR::Options::disableOptimization, isolatedStoreElimination, 0, "P"},
    {"disableIterativeSA",       "O\trevert back to a recursive version of Structural Analysis", SET_OPTION_BIT(TR_DisableIterativeSA), "P"},
@@ -607,6 +609,7 @@ TR::OptionTable OMR::Options::_jitOptions[] = {
    {"disableZHelix",                      "O\t[Deprecated] alias for disableZEC12",                          SET_OPTION_BIT(TR_DisableZEC12), "F"},
    {"disableZImplicitNullChecks",         "O\tdisable implicit null checks on 390",            SET_OPTION_BIT(TR_DisableZImplicitNullChecks), "F"},
    {"disableZNext",                       "O\tdisable zNext support",                        SET_OPTION_BIT(TR_DisableZNext), "F"},
+   {"disclaimMemoryOnSwap",               "M\tuse swap file as a backup for disclaimed memory (linux only).", SET_OPTION_BIT(TR_DisclaimMemoryOnSwap),"F", NOT_IN_SUBSET},
    {"dltMostOnce",                        "O\tprevent DLT compilation of a method at more than one bytecode index.", SET_OPTION_BIT(TR_DLTMostOnce), "F"},
    {"dltOptLevel=cold",                   "O\tforce DLT compilation at cold level",            TR::Options::set32BitValue, offsetof(OMR::Options, _dltOptLevel), cold, "P"},
    {"dltOptLevel=hot",                    "O\tforce DLT compilation at hot level",             TR::Options::set32BitValue, offsetof(OMR::Options, _dltOptLevel), hot, "P"},

diff --git a/compiler/control/OMROptions.hpp b/compiler/control/OMROptions.hpp
@@ -386,9 +386,9 @@ enum TR_CompilationOptions
 
    // Option word 10
    //
-   // Available                           = 0x00000020 + 10,
-   // Available                           = 0x00000040 + 10,
-   // Available                           = 0x00000080 + 10,
+   TR_DisableDataCacheDisclaiming         = 0x00000020 + 10,
+   TR_DisableIProfilerDataDisclaiming     = 0x00000040 + 10,
+   TR_DisclaimMemoryOnSwap                = 0x00000080 + 10,
    TR_FirstLevelProfiling                 = 0x00000100 + 10,
    // Available                           = 0x00000200 + 10,
    // Available                           = 0x00000400 + 10,