Merge pull request eclipse#6779 from VermaSh/replace_zNext_with_z16

Replace zNext with z16
cjjdespres · Nov 28, 2022 · acdbafc · acdbafc
2 parents 8d7fef1 + e355ae4
commit acdbafc
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 10 deletions.
diff --git a/compiler/control/OMROptions.cpp b/compiler/control/OMROptions.cpp
@@ -594,6 +594,7 @@ TR::OptionTable OMR::Options::_jitOptions[] = {
    {"disableZ13",                         "O\tdisable z13 support",                        SET_OPTION_BIT(TR_DisableZ13), "F"},
    {"disableZ14",                         "O\tdisable z14 support",                            SET_OPTION_BIT(TR_DisableZ14), "F"},
    {"disableZ15",                         "O\tdisable z15 support",                        SET_OPTION_BIT(TR_DisableZ15), "F"},
+   {"disableZ16",                         "O\tdisable z16 support",                        SET_OPTION_BIT(TR_DisableZ16), "F"},
    {"disableZ196",                        "O\tdisable z196 support",                           SET_OPTION_BIT(TR_DisableZ196), "F"},
    {"disableZArraySetUnroll",             "O\tdisable arraySet unrolling on 390.",             SET_OPTION_BIT(TR_DisableZArraySetUnroll), "F"},
    {"disableZealousCodegenOpts",          "O\tdisable use of zealous codegen optimizations.", SET_OPTION_BIT(TR_DisableZealousCodegenOpts), "F"},

diff --git a/compiler/control/OMROptions.hpp b/compiler/control/OMROptions.hpp
@@ -328,7 +328,7 @@ enum TR_CompilationOptions
    TR_EnableLowerCompilationLimitsDecisionMaking
                                           = 0x00000020 + 8,
    TR_DisableDirectToJNI                  = 0x00000040 + 8,
-   // Available                           = 0x00000080 + 8,
+   TR_DisableZ16                          = 0x00000080 + 8,
    TR_EmitExecutableELFFile               = 0x00000100 + 8,
    TR_JITServerFollowRemoteCompileWithLocalCompile = 0x00000200 + 8,
    TR_EnableClassChainValidationCaching   = 0x00000800 + 8,

diff --git a/compiler/z/codegen/OMRInstOpCode.enum b/compiler/z/codegen/OMRInstOpCode.enum
@@ -1173,7 +1173,7 @@
    VSRD,                // vector shift right double by bit
    VSTRS,               // vector string search
 
-   /* zNext Instructions */
+   /* z16 Instructions */
    VCLZDP,              // VECTOR COUNT LEADING ZERO DIGITS
    VPKZR,               // VECTOR PACK ZONED REGISTER
    VUPKZL,              // VECTOR UNPACK ZONED LOW

diff --git a/compiler/z/codegen/OMRInstOpCodeProperties.hpp b/compiler/z/codegen/OMRInstOpCodeProperties.hpp
@@ -15996,7 +15996,7 @@
    /* .opcode[0]   = */ 0xE6,
    /* .opcode[1]   = */ 0x51,
    /* .format      = */ VRRk_FORMAT,
-   /* .minimumALS  = */ OMR_PROCESSOR_S390_ZNEXT,
+   /* .minimumALS  = */ OMR_PROCESSOR_S390_Z16,
    /* .properties  = */ S390OpProp_SetsOperand1 |
                         S390OpProp_UsesM3
    },
@@ -16008,7 +16008,7 @@
    /* .opcode[0]   = */ 0xE6,
    /* .opcode[1]   = */ 0x70,
    /* .format      = */ VRIf_FORMAT,
-   /* .minimumALS  = */ OMR_PROCESSOR_S390_ZNEXT,
+   /* .minimumALS  = */ OMR_PROCESSOR_S390_Z16,
    /* .properties  = */ S390OpProp_SetsCC |
                         S390OpProp_SetsOperand1 |
                         S390OpProp_UsesM5
@@ -16021,7 +16021,7 @@
    /* .opcode[0]   = */ 0xE6,
    /* .opcode[1]   = */ 0x5C,
    /* .format      = */ VRRk_FORMAT,
-   /* .minimumALS  = */ OMR_PROCESSOR_S390_ZNEXT,
+   /* .minimumALS  = */ OMR_PROCESSOR_S390_Z16,
    /* .properties  = */ S390OpProp_SetsOperand1 |
                         S390OpProp_UsesM3
    },
@@ -16033,7 +16033,7 @@
    /* .opcode[0]   = */ 0xE6,
    /* .opcode[1]   = */ 0x54,
    /* .format      = */ VRRk_FORMAT,
-   /* .minimumALS  = */ OMR_PROCESSOR_S390_ZNEXT,
+   /* .minimumALS  = */ OMR_PROCESSOR_S390_Z16,
    /* .properties  = */ S390OpProp_SetsOperand1 |
                         S390OpProp_UsesM3
    },
diff --git a/compiler/z/env/OMRCPU.cpp b/compiler/z/env/OMRCPU.cpp
@@ -75,7 +75,7 @@ OMR::Z::CPU::detect(OMRPortLibrary * const omrPortLib)
       omrsysinfo_processor_set_feature(&processorDescription, OMR_FEATURE_S390_VECTOR_PACKED_DECIMAL_ENHANCEMENT_FACILITY, FALSE);
       }
 
-   if (processorDescription.processor < OMR_PROCESSOR_S390_ZNEXT)
+   if (processorDescription.processor < OMR_PROCESSOR_S390_Z16)
       {
       omrsysinfo_processor_set_feature(&processorDescription, OMR_FEATURE_S390_VECTOR_PACKED_DECIMAL_ENHANCEMENT_FACILITY_2, FALSE);
       }
@@ -141,6 +141,9 @@ OMR::Z::CPU::isAtLeastOldAPI(OMRProcessorArchitecture p)
       case OMR_PROCESSOR_S390_Z15:
          ans = self()->getSupportsArch(TR::CPU::z15);
          break;
+      case OMR_PROCESSOR_S390_Z16:
+         ans = self()->getSupportsArch(TR::CPU::z16);
+         break;
       case OMR_PROCESSOR_S390_ZNEXT:
          ans = self()->getSupportsArch(TR::CPU::zNext);
          break;
@@ -241,6 +244,9 @@ OMR::Z::CPU::getProcessorName()
       case OMR_PROCESSOR_S390_Z15:
          result = "z15";
          break;
+      case OMR_PROCESSOR_S390_Z16:
+         result = "z16";
+         break;
       case OMR_PROCESSOR_S390_ZNEXT:
          result = "zNext";
          break;

diff --git a/compiler/z/env/OMRCPU.hpp b/compiler/z/env/OMRCPU.hpp
@@ -61,6 +61,7 @@ class OMR_EXTENSIBLE CPU : public OMR::CPU
       z13,
       z14,
       z15,
+      z16,
       zNext,
       };
 

diff --git a/include_core/omrport.h b/include_core/omrport.h
@@ -1363,6 +1363,7 @@ typedef enum OMRProcessorArchitecture {
 	OMR_PROCESSOR_S390_Z13,
 	OMR_PROCESSOR_S390_Z14,
 	OMR_PROCESSOR_S390_Z15,
+	OMR_PROCESSOR_S390_Z16,
 	OMR_PROCESSOR_S390_ZNEXT,
 	OMR_PROCESSOR_S390_LAST = OMR_PROCESSOR_S390_ZNEXT,
 
@@ -1609,7 +1610,7 @@ typedef struct OMRProcessorDesc {
 /* STFLE bit 152 - Vector packed decimal enhancement facility */
 #define OMR_FEATURE_S390_VECTOR_PACKED_DECIMAL_ENHANCEMENT_FACILITY 152
 
-/* zNext facilities */
+/* z16 facilities */
 
 /* STFLE bit 192 - Vector-Packed-Decimal-Enhancement Facility 2 */
 #define OMR_FEATURE_S390_VECTOR_PACKED_DECIMAL_ENHANCEMENT_FACILITY_2 192

diff --git a/port/unix/omrsysinfo.c b/port/unix/omrsysinfo.c
@@ -1704,7 +1704,7 @@ omrsysinfo_get_s390_description(struct OMRPortLibrary *portLibrary, OMRProcessor
 		}
 	}
 
-   /* zNext facility and processor detection */
+   /* z16 facility and processor detection */
 
 	if (omrsysinfo_test_stfle(portLibrary, OMR_FEATURE_S390_VECTOR_PACKED_DECIMAL_ENHANCEMENT_FACILITY_2)) {
 #if defined(J9ZOS390)
@@ -1715,7 +1715,7 @@ omrsysinfo_get_s390_description(struct OMRPortLibrary *portLibrary, OMRProcessor
 		{
 			omrsysinfo_set_feature(desc, OMR_FEATURE_S390_VECTOR_PACKED_DECIMAL_ENHANCEMENT_FACILITY_2);
 
-			desc->processor = OMR_PROCESSOR_S390_ZNEXT;
+			desc->processor = OMR_PROCESSOR_S390_Z16;
 		}
 	}