Merge pull request #6614 from r30shah/enforceVectorAPIExpansionPR

Add Enforce Vector API Expansion Option
eclipse-openj9 · Aug 5, 2022 · f764fb1 · f764fb1
2 parents 754513d + d6329df
commit f764fb1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/compiler/control/OMROptions.cpp b/compiler/control/OMROptions.cpp
@@ -773,6 +773,7 @@ TR::OptionTable OMR::Options::_jitOptions[] = {
    {"enableYieldVMAccess",                "O\tenable yielding of VM access when GC is waiting", SET_OPTION_BIT(TR_EnableYieldVMAccess), "F"},
    {"enableZEpilogue",                    "O\tenable 64-bit 390 load-multiple breakdown.", SET_OPTION_BIT(TR_Enable39064Epilogue), "F"},
    {"enableZNext",                        "O\tenable zNext support",                        RESET_OPTION_BIT(TR_DisableZNext), "F"},
+   {"enforceVectorAPIExpansion",          "O\tSets up platform specific sub options to enforce Vector API Expansion of Vector API Instrinsics",           SET_OPTION_BIT(TR_EnforceVectorAPIExpansion), "F"},
    {"enumerateAddresses=", "D\tselect kinds of addresses to be replaced by unique identifiers in trace file", TR::Options::setAddressEnumerationBits, offsetof(OMR::Options, _addressToEnumerate), 0, "F"},
    {"estimateRegisterPressure",           "O\tdeprecated; equivalent to enableRegisterPressureSimulation", RESET_OPTION_BIT(TR_DisableRegisterPressureSimulation), "F"},
    {"experimentalClassLoadPhase",         "O\tenable the experimental class load phase algorithm", SET_OPTION_BIT(TR_ExperimentalClassLoadPhase), "F"},
@@ -1869,6 +1870,16 @@ OMR::Options::Options(
          optimizationPlan->setOptLevelDowngraded(false);
          }
       }
+   // Following set of options are needed as a workaround to enforce vector API
+   // expansion of Vector API intrinsics for each platform.
+   // TODO: This enforce option is added temporary to test JIT exploitation of
+   // Vector API, clean up is needed once we have resolved all workarounds.
+   if (self()->getOption(TR_EnforceVectorAPIExpansion))
+      {
+      self()->setOption(TR_DisableOSRGuardMerging);
+      self()->setOption(TR_ProcessHugeMethods);
+      optimizationPlan->setOptLevel(scorching);
+      }
 
    // now set the current opt level in TR::Options
    //
@@ -3680,7 +3691,6 @@ OMR::Options::jitPostProcess()
       TR::Options::disableSamplingThread();
       }
 
-
    if (self()->getOption(TR_StaticDebugCountersRequested) && !_enabledStaticCounterNames)
       _enabledStaticCounterNames = _enabledDynamicCounterNames;
 

diff --git a/compiler/control/OMROptions.hpp b/compiler/control/OMROptions.hpp
@@ -185,7 +185,7 @@ enum TR_CompilationOptions
    TR_DisableAotAtCheapWarm               = 0x00001000 + 3,
    TR_Profile                             = 0x00002000 + 3,
    TR_DisableAsyncCompilation             = 0x00004000 + 3,
-   // Available                           = 0x00008000 + 3,
+   TR_EnforceVectorAPIExpansion           = 0x00008000 + 3,
    // Available                           = 0x00010000 + 3,
    TR_EnableJITServerHeuristics           = 0x00020000 + 3,
    TR_SoftFailOnAssume                    = 0x00040000 + 3,