8269175: [macosx-aarch64] wrong CPU speed in hs_err file

Vladimir Kempik · Vladimir Kempik · commit c0ab12db5d1f · 2021-12-20T08:16:44.000Z
Backport-of: bcbe3845d92e38ad0086cc337dc5957842eef056
diff --git a/src/hotspot/os/bsd/os_bsd.cpp b/src/hotspot/os/bsd/os_bsd.cpp
@@ -1392,13 +1392,17 @@ void os::get_summary_cpu_info(char* buf, size_t buflen) {
       strncpy(machine, "", sizeof(machine));
   }
 
-  const char* emulated = "";
 #if defined(__APPLE__) && !defined(ZERO)
   if (VM_Version::is_cpu_emulated()) {
-    emulated = " (EMULATED)";
+    snprintf(buf, buflen, "\"%s\" %s (EMULATED) %d MHz", model, machine, mhz);
+  } else {
+    NOT_AARCH64(snprintf(buf, buflen, "\"%s\" %s %d MHz", model, machine, mhz));
+    // aarch64 CPU doesn't report its speed
+    AARCH64_ONLY(snprintf(buf, buflen, "\"%s\" %s", model, machine));
   }
+#else
+  snprintf(buf, buflen, "\"%s\" %s %d MHz", model, machine, mhz);
 #endif
-  snprintf(buf, buflen, "\"%s\" %s%s %d MHz", model, machine, emulated, mhz);
 }
 
 void os::print_memory_info(outputStream* st) {

Original file line number	Diff line number	Diff line change
`@@ -1392,13 +1392,17 @@ void os::get_summary_cpu_info(char* buf, size_t buflen) {`
`1392`	`1392`	`strncpy(machine, "", sizeof(machine));`
`1393`	`1393`	`}`
`1394`	`1394`
`1395`		`- const char* emulated = "";`
`1396`	`1395`	`#if defined(__APPLE__) && !defined(ZERO)`
`1397`	`1396`	`if (VM_Version::is_cpu_emulated()) {`
`1398`		`- emulated = " (EMULATED)";`
	`1397`	`+ snprintf(buf, buflen, "\"%s\" %s (EMULATED) %d MHz", model, machine, mhz);`
	`1398`	`+ } else {`
	`1399`	`+ NOT_AARCH64(snprintf(buf, buflen, "\"%s\" %s %d MHz", model, machine, mhz));`
	`1400`	`+ // aarch64 CPU doesn't report its speed`
	`1401`	`+ AARCH64_ONLY(snprintf(buf, buflen, "\"%s\" %s", model, machine));`
`1399`	`1402`	`}`
	`1403`	`+#else`
	`1404`	`+ snprintf(buf, buflen, "\"%s\" %s %d MHz", model, machine, mhz);`
`1400`	`1405`	`#endif`
`1401`		`- snprintf(buf, buflen, "\"%s\" %s%s %d MHz", model, machine, emulated, mhz);`
`1402`	`1406`	`}`
`1403`	`1407`
`1404`	`1408`	`void os::print_memory_info(outputStream* st) {`