diff --git a/compiler/control/OMROptions.cpp b/compiler/control/OMROptions.cpp index cf7e76077b4..afd726a9dac 100644 --- a/compiler/control/OMROptions.cpp +++ b/compiler/control/OMROptions.cpp @@ -741,7 +741,6 @@ TR::OptionTable OMR::Options::_jitOptions[] = { {"enableMutableCallSiteGuards", "O\tenable virtual guards for calls to java.lang.invoke.MutableCallSite.getTarget().invokeExact(...) (including invokedynamic)", RESET_OPTION_BIT(TR_DisableMutableCallSiteGuards), "F"}, {"enableNewAllocationProfiling", "O\tenable profiling of new allocations", SET_OPTION_BIT(TR_EnableNewAllocationProfiling), "F"}, {"enableNewCheckCastInstanceOf", "O\tenable new Checkcast/InstanceOf evaluator", SET_OPTION_BIT(TR_EnableNewCheckCastInstanceOf), "F"}, - {"enableNewX86PrefetchTLH", "O\tenable new X86 TLH prefetch algorithm", SET_OPTION_BIT(TR_EnableNewX86PrefetchTLH), "F"}, {"enableNodeGC", "M\tenable node recycling", SET_OPTION_BIT(TR_EnableNodeGC), "F"}, {"enableOldEDO", "O\tenable the old EDO mechanism", SET_OPTION_BIT(TR_EnableOldEDO), "F", NOT_IN_SUBSET}, {"enableOnsiteCacheForSuperClassTest", "O\tenable onsite cache for super class test", SET_OPTION_BIT(TR_EnableOnsiteCacheForSuperClassTest), "F"}, diff --git a/compiler/control/OMROptions.hpp b/compiler/control/OMROptions.hpp index c29c0241134..06a5ca50987 100644 --- a/compiler/control/OMROptions.hpp +++ b/compiler/control/OMROptions.hpp @@ -401,7 +401,7 @@ enum TR_CompilationOptions TR_EnableSequentialLoadStoreWarm = 0x00020000 + 10, TR_EnableSequentialLoadStoreCold = 0x00040000 + 10, // Available = 0x00080000 + 10, - TR_EnableNewX86PrefetchTLH = 0x00100000 + 10, + // Available = 0x00100000 + 10, // Available = 0x00200000 + 10, TR_ConservativeCompilation = 0x00400000 + 10, // Available = 0x00800000 + 10, diff --git a/compiler/runtime/Helpers.inc b/compiler/runtime/Helpers.inc index 1d72fec9e64..9b293dc99c9 100644 --- a/compiler/runtime/Helpers.inc +++ b/compiler/runtime/Helpers.inc @@ -165,11 +165,10 @@ SETVAL(TR_X86interpreterUnresolvedStaticFieldSetterGlue,TR_FSRH+29) SETVAL(TR_X86interpreterUnresolvedFieldGlue,TR_FSRH+30) SETVAL(TR_X86interpreterUnresolvedFieldSetterGlue,TR_FSRH+31) SETVAL(TR_X86prefetchTLH,TR_FSRH+32) -SETVAL(TR_X86newPrefetchTLH,TR_FSRH+33) -SETVAL(TR_X86CodeCachePrefetchHelper,TR_FSRH+34) -SETVAL(TR_X86interpreterUnresolvedConstantDynamicGlue,TR_FSRH+35) -SETVAL(TR_X86interpreterStaticAndSpecialGlue,TR_FSRH+36) -SETVAL(TR_LXRH,TR_FSRH+37) +SETVAL(TR_X86CodeCachePrefetchHelper,TR_FSRH+33) +SETVAL(TR_X86interpreterUnresolvedConstantDynamicGlue,TR_FSRH+34) +SETVAL(TR_X86interpreterStaticAndSpecialGlue,TR_FSRH+35) +SETVAL(TR_LXRH,TR_FSRH+36) SETVAL(TR_IA32longDivide,TR_LXRH+0) SETVAL(TR_IA32longRemainder,TR_LXRH+1)