Merge pull request #15711 from r30shah/vectorCheck

Check for vector support on Z in supportedForPlatform
eclipse-openj9 · Aug 19, 2022 · ae6f910 · ae6f910
2 parents 984612f + 7ea3491
commit ae6f910
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/runtime/compiler/optimizer/VectorAPIExpansion.cpp b/runtime/compiler/optimizer/VectorAPIExpansion.cpp
@@ -19,7 +19,6 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
  *******************************************************************************/
-#include "codegen/CodeGenerator.hpp"
 #include "compile/ResolvedMethod.hpp"
 #include "env/VerboseLog.hpp"
 #include "env/VMAccessCriticalSection.hpp"

diff --git a/runtime/compiler/optimizer/VectorAPIExpansion.hpp b/runtime/compiler/optimizer/VectorAPIExpansion.hpp
@@ -25,6 +25,7 @@
 #include <stdint.h>
 #include "optimizer/Optimization.hpp"
 #include "optimizer/OptimizationManager.hpp"
+#include "codegen/CodeGenerator.hpp"
 #include "codegen/RecognizedMethods.hpp"
 #include "il/SymbolReference.hpp"
 #include "infra/Assert.hpp"
@@ -264,7 +265,9 @@ class TR_VectorAPIExpansion : public TR::Optimization
    static TR::VectorLength supportedOnPlatform(TR::Compilation *comp, vec_sz_t vectorLength)
          {
          // General check for supported infrastructure
-         if (!comp->target().cpu.isPower() && !comp->target().cpu.isZ() && !comp->target().cpu.isARM64())
+         if (!comp->target().cpu.isPower() &&
+               !(comp->target().cpu.isZ() && comp->cg()->getSupportsVectorRegisters()) &&
+               !comp->target().cpu.isARM64())
             return TR::NoVectorLength;
 
          if (vectorLength != 128)