[OpenMP][host runtime] small fixup of RTM CPUID bit check

jpeyton52 · jpeyton52 · commit b840d3ab0d8a · 2021-10-14T16:49:42.000-05:00
diff --git a/openmp/runtime/src/kmp_utility.cpp b/openmp/runtime/src/kmp_utility.cpp
@@ -247,15 +247,15 @@ void __kmp_query_cpuid(kmp_cpuinfo_t *p) {
                 i, buf.eax, buf.ebx, buf.ecx, buf.edx));
     }
 #endif
-#if KMP_USE_ADAPTIVE_LOCKS
     p->flags.rtm = 0;
     if (max_arg > 7) {
       /* RTM bit CPUID.07:EBX, bit 11 */
       __kmp_x86_cpuid(7, 0, &buf);
       p->flags.rtm = (buf.ebx >> 11) & 1;
-      KA_TRACE(trace_level, (" RTM"));
+      if (p->flags.rtm) {
+        KA_TRACE(trace_level, (" RTM"));
+      }
     }
-#endif
   }
 
   { // Parse CPU brand string for frequency, saving the string for later.

Original file line number	Diff line number	Diff line change
`@@ -247,15 +247,15 @@ void __kmp_query_cpuid(kmp_cpuinfo_t *p) {`
`247`	`247`	`i, buf.eax, buf.ebx, buf.ecx, buf.edx));`
`248`	`248`	`}`
`249`	`249`	`#endif`
`250`		`-#if KMP_USE_ADAPTIVE_LOCKS`
`251`	`250`	`p->flags.rtm = 0;`
`252`	`251`	`if (max_arg > 7) {`
`253`	`252`	`/* RTM bit CPUID.07:EBX, bit 11 */`
`254`	`253`	`__kmp_x86_cpuid(7, 0, &buf);`
`255`	`254`	`p->flags.rtm = (buf.ebx >> 11) & 1;`
`256`		`- KA_TRACE(trace_level, (" RTM"));`
	`255`	`+ if (p->flags.rtm) {`
	`256`	`+ KA_TRACE(trace_level, (" RTM"));`
	`257`	`+ }`
`257`	`258`	`}`
`258`		`-#endif`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`{ // Parse CPU brand string for frequency, saving the string for later.`