Merge pull request #7568 from a7ehuo/system-arraycopy-revert-PR7534

Revert "Merge pull request #7534"
eclipse-openj9 · Dec 3, 2024 · 82df57f · 82df57f
2 parents cd5ca19 + 4a3f4f3
commit 82df57f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/compiler/control/OMROptions.hpp b/compiler/control/OMROptions.hpp
@@ -1497,11 +1497,11 @@ class OMR_EXTENSIBLE Options
       _edoRecompSizeThreshold = 0;
       _edoRecompSizeThresholdInStartupMode = 0;
       _catchBlockCounterThreshold = 0;
-      _arraycopyRepMovsByteArrayThreshold = 0;
-      _arraycopyRepMovsCharArrayThreshold = 0;
-      _arraycopyRepMovsIntArrayThreshold = 0;
-      _arraycopyRepMovsLongArrayThreshold = 0;
-      _arraycopyRepMovsReferenceArrayThreshold = 0;
+      _arraycopyRepMovsByteArrayThreshold = 32;
+      _arraycopyRepMovsCharArrayThreshold = 32;
+      _arraycopyRepMovsIntArrayThreshold = 32;
+      _arraycopyRepMovsLongArrayThreshold = 32;
+      _arraycopyRepMovsReferenceArrayThreshold = 32;
 
       memset(_options, 0, sizeof(_options));
       memset(_disabledOptimizations, false, sizeof(_disabledOptimizations));

diff --git a/compiler/x/codegen/OMRTreeEvaluator.cpp b/compiler/x/codegen/OMRTreeEvaluator.cpp
@@ -2743,7 +2743,7 @@ static bool enablePrimitiveArrayCopyInlineSmallSizeWithoutREPMOVS(uint8_t elemen
 
    bool disableEnhancement = false;
 
-   threshold = 64;
+   threshold = 32;
 
    switch (elementSize)
       {
@@ -2752,10 +2752,8 @@ static bool enablePrimitiveArrayCopyInlineSmallSizeWithoutREPMOVS(uint8_t elemen
          disableEnhancement = disable64BitPrimitiveArrayCopyInlineSmallSizeWithoutREPMOVS
                               || cg->comp()->getOption(TR_Disable64BitPrimitiveArrayCopyInlineSmallSizeWithoutREPMOVS);
 
-         threshold = cg->comp()->target().cpu.supportsFeature(OMR_FEATURE_X86_AVX512F) ? 128 : 64;
-
          int32_t newThreshold = cg->comp()->getOptions()->getArraycopyRepMovsLongArrayThreshold();
-         if ((newThreshold == 32) || (newThreshold == 64) || (newThreshold == 128))
+         if ((threshold < newThreshold) && ((newThreshold == 64) || (newThreshold == 128)))
             {
             // If the CPU doesn't support AVX512, reduce the threshold to 64 bytes
             threshold = ((newThreshold == 128) && !cg->comp()->target().cpu.supportsFeature(OMR_FEATURE_X86_AVX512F)) ? 64 : newThreshold;
@@ -2767,10 +2765,8 @@ static bool enablePrimitiveArrayCopyInlineSmallSizeWithoutREPMOVS(uint8_t elemen
          disableEnhancement = disable32BitPrimitiveArrayCopyInlineSmallSizeWithoutREPMOVS
                               || cg->comp()->getOption(TR_Disable32BitPrimitiveArrayCopyInlineSmallSizeWithoutREPMOVS);
 
-         threshold = cg->comp()->target().cpu.supportsFeature(OMR_FEATURE_X86_AVX512F) ? 128 : 64;
-
          int32_t newThreshold = cg->comp()->getOptions()->getArraycopyRepMovsIntArrayThreshold();
-         if ((newThreshold == 32) || (newThreshold == 64) || (newThreshold == 128))
+         if ((threshold < newThreshold) && ((newThreshold == 64) || (newThreshold == 128)))
             {
             // If the CPU doesn't support AVX512, reduce the threshold to 64 bytes
             threshold = ((newThreshold == 128) && !cg->comp()->target().cpu.supportsFeature(OMR_FEATURE_X86_AVX512F)) ? 64 : newThreshold;
@@ -2785,7 +2781,7 @@ static bool enablePrimitiveArrayCopyInlineSmallSizeWithoutREPMOVS(uint8_t elemen
          int32_t newThreshold = cg->comp()->getOptions()->getArraycopyRepMovsCharArrayThreshold();
 
          // Char array enhancement supports only 32 or 64 bytes
-         threshold = (newThreshold == 32) ? 32 : threshold;
+         threshold = (newThreshold == 64) ? 64 : threshold;
          }
          break;
       default: // 1 byte
@@ -2796,7 +2792,7 @@ static bool enablePrimitiveArrayCopyInlineSmallSizeWithoutREPMOVS(uint8_t elemen
          int32_t newThreshold = cg->comp()->getOptions()->getArraycopyRepMovsByteArrayThreshold();
 
          // Byte array enhancement supports only 32 or 64 bytes
-         threshold = (newThreshold == 32) ? 32 : threshold;
+         threshold = (newThreshold == 64) ? 64 : threshold;
          }
          break;
       }