Merge pull request #7522 from zl-wang/master

Recognize POWER11 and future coverage on AIX
eclipse-omr · Nov 5, 2024 · aeffcb5 · aeffcb5
2 parents 68ee3a4 + 8d601c9
commit aeffcb5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/compiler/p/env/OMRCPU.cpp b/compiler/p/env/OMRCPU.cpp
@@ -186,6 +186,8 @@ OMR::Power::CPU::getOldProcessorTypeFromNewProcessorType(OMRProcessorArchitectur
          return TR_PPCp9;
       case OMR_PROCESSOR_PPC_P10:
          return TR_PPCp10;
+      case OMR_PROCESSOR_PPC_P11:
+         return TR_PPCp11;
       default:
          TR_ASSERT_FATAL(false, "Unknown processor!");
       }
@@ -234,6 +236,10 @@ OMR::Power::CPU::getProcessorName()
          returnString = "PPCp10";
          break;
 
+      case OMR_PROCESSOR_PPC_P11:
+         returnString = "PPCp11";
+         break;
+
       case OMR_PROCESSOR_PPC_PULSAR:
          returnString = "PPCpulsar";
          break;

diff --git a/port/unix/omrsysinfo.c b/port/unix/omrsysinfo.c
@@ -253,6 +253,19 @@ static intptr_t omrsysinfo_get_aix_ppc_description(struct OMRPortLibrary *portLi
 #define __power_10() (_system_configuration.implementation == POWER_10)
 #endif /* !defined(__power_10) */
 
+#if !defined(__power_11)
+#define POWER_11 0x80000 /* Power 11 class CPU */
+#define __power_11() (_system_configuration.implementation == POWER_11)
+#endif /* !defined(__power_11) */
+
+/*
+ * Please update the macro below to stay in sync with the latest POWER processor known to OMR,
+ * ensuring CPU recognition is more robust than in the past. As the macro currently stands, any
+ * later processors are recognized as at least POWER11.
+ */
+#define POWER11_OR_ABOVE (0xFFFFFFFF << 19)
+#define __power_latestKnownAndUp() OMR_ARE_ANY_BITS_SET(_system_configuration.implementation, POWER11_OR_ABOVE)
+
 #if defined(J9OS_I5_V6R1) /* vmx_version id only available since TL4 */
 #define __power_vsx() (_system_configuration.vmx_version > 1)
 #endif
@@ -1182,6 +1195,8 @@ omrsysinfo_get_aix_ppc_description(struct OMRPortLibrary *portLibrary, OMRProces
 		desc->processor = OMR_PROCESSOR_PPC_P9;
 	} else if (__power_10()) {
 		desc->processor = OMR_PROCESSOR_PPC_P10;
+	} else if (__power_latestKnownAndUp()) {
+		desc->processor = OMR_PROCESSOR_PPC_P11;
 	} else {
 		desc->processor = OMR_PROCESSOR_PPC_UNKNOWN;
 	}