Removed all references to TR_EnableNewX86PrefetchTLH and TR_X86newPre…

…fetchTLH Signed-off-by: Michael Wang <mw918@hotmail.com>
eclipse-openj9 · Apr 14, 2020 · 75553dd · 75553dd
1 parent 985300d
commit 75553dd
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 29 deletions.
diff --git a/runtime/compiler/x/codegen/AllocPrefetchSnippet.cpp b/runtime/compiler/x/codegen/AllocPrefetchSnippet.cpp
@@ -83,20 +83,6 @@ uint8_t *TR::X86AllocPrefetchSnippet::emitSnippetBody()
       {
       disp32 = (int32_t)(helperAddress - (uintptr_t)(buffer+4));
       }
-   else
-      {
-      TR_RuntimeHelper helper = (comp->getOption(TR_EnableNewX86PrefetchTLH)) ? TR_X86newPrefetchTLH : TR_X86prefetchTLH;
-      helperSymRef = cg()->symRefTab()->findOrCreateRuntimeHelper(helper, false, false, false);
-      disp32 = cg()->branchDisplacementToHelperOrTrampoline(buffer+4, helperSymRef);
-      if (fej9->needRelocationsForHelpers())
-         {
-         cg()->addExternalRelocation(new (cg()->trHeapMemory()) TR::ExternalRelocation(buffer,
-                                                                                (uint8_t *)helperSymRef,
-                                                                                TR_HelperAddress,
-                                                                                cg()),
-                                   __FILE__, __LINE__, getNode());
-         }
-      }
 
    *(int32_t *)buffer = disp32;
    buffer += 4;

diff --git a/runtime/compiler/x/codegen/J9TreeEvaluator.cpp b/runtime/compiler/x/codegen/J9TreeEvaluator.cpp
@@ -6339,8 +6339,6 @@ static void genHeapAlloc(
             useDirectPrefetchCall = true;
             }
 
-         if (!comp->getOption(TR_EnableNewX86PrefetchTLH))
-            {
             generateRegRegInstruction(SUB4RegReg, node, tempReg, eaxReal, cg);
 
             generateMemRegInstruction(SUB4MemReg,
@@ -6368,19 +6366,6 @@ static void genHeapAlloc(
 #endif
                generateImmSymInstruction(CALLImm4, node, (uintptr_t)helperSymbol->getMethodAddress(), helperSymRef, cg);
                }
-            }
-         else
-            {
-            // This currently only works when 'tlhPrefetchFTA' field is 4 bytes (on 32-bit or a
-            // compressed references build).  True 64-bit support requires this field be widened
-            // to 64-bits.
-            //
-            generateRegMemInstruction(CMP4RegMem, node,
-                                      tempReg,
-                                      generateX86MemoryReference(vmThreadReg,tlhPrefetchFTA_offset, cg),
-                                      cg);
-            generateLabelInstruction(JAE4, node, prefetchSnippetLabel, cg);
-            }
 
          generateLabelInstruction(LABEL, node, restartLabel, cg);
          }