Fix non-x86 build (removing uses of kmp_cpuinfo_t)

[hfinkel]

Summary

The non-x86 build is currently broken. The problem is that the definition of kmp_cpuinfo_t contains:

char       name [3*sizeof (kmp_cpuid_t)]; // CPUID(0x80000002,0x80000003,0x80000004)

and kmp_cpuid_t is only defined when compiling for x86. This patch removes uses of kmp_cpuinfo_t when not building on x86.

[jlpeyton]

LGTM.

[tlwilmar]

LGTM

openmp/trunk/runtime/src/kmp.h

typedef struct kmp_sys_info {
     long majflt;          /* the number of page faults serviced that required I/O      */
     long nswap;           /* the number of times a process was "swapped" out of memory */
     long inblock;         /* the number of times the file system had to perform input  */
     long oublock;         /* the number of times the file system had to perform output */
     long nvcsw;           /* the number of times a context switch was voluntarily      */
     long nivcsw;          /* the number of times a context switch was forced           */
 } kmp_sys_info_t;
 
+#if KMP_ARCH_X86 || KMP_ARCH_X86_64
 typedef struct kmp_cpuinfo {
     int        initialized;  // If 0, other fields are not initialized.
     int        signature;    // CPUID(1).EAX
     int        family;       // CPUID(1).EAX[27:20] + CPUID(1).EAX[11:8] ( Extended Family + Family )
     int        model;        // ( CPUID(1).EAX[19:16] << 4 ) + CPUID(1).EAX[7:4] ( ( Extended Model << 4 ) + Model)
     int        stepping;     // CPUID(1).EAX[3:0] ( Stepping )
     int        sse2;         // 0 if SSE2 instructions are not supported, 1 otherwise.
     int        rtm;          // 0 if RTM instructions are not supported, 1 otherwise.
     int        cpu_stackoffset;
     int        apic_id;
     int        physical_id;
     int        logical_id;
     kmp_uint64 frequency;    // Nominal CPU frequency in Hz.
     char       name [3*sizeof (kmp_cpuid_t)]; // CPUID(0x80000002,0x80000003,0x80000004)
 } kmp_cpuinfo_t;
-
+#endif
 
 #ifdef BUILD_TV
 
 struct tv_threadprivate {
     /* Record type #1 */
     void        *global_addr;
     void        *thread_addr;
 };

 extern int      __kmp_par_range_ub;
 #endif
 
 /* For printing out dynamic storage map for threads and teams */
 extern int      __kmp_storage_map;         /* True means print storage map for threads and teams */
 extern int      __kmp_storage_map_verbose; /* True means storage map includes placement info */
 extern int      __kmp_storage_map_verbose_specified;
 
+#if KMP_ARCH_X86 || KMP_ARCH_X86_64
 extern kmp_cpuinfo_t    __kmp_cpuinfo;
+#endif
 
 extern volatile int __kmp_init_serial;
 extern volatile int __kmp_init_gtid;
 extern volatile int __kmp_init_common;
 extern volatile int __kmp_init_middle;
 extern volatile int __kmp_init_parallel;
 extern volatile int __kmp_init_monitor;
 extern volatile int __kmp_init_user_locks;

openmp/trunk/runtime/src/kmp_csupport.c

 static __forceinline kmp_dyna_lockseq_t
 __kmp_map_hint_to_lock(uintptr_t hint)
 {
 #if KMP_USE_TSX
 # define KMP_TSX_LOCK(seq) lockseq_##seq
 #else
 # define KMP_TSX_LOCK(seq) __kmp_user_lock_seq
 #endif
+
+#if KMP_ARCH_X86 || KMP_ARCH_X86_64
+# define KMP_CPUINFO_RTM (__kmp_cpuinfo.rtm)
+#else
+# define KMP_CPUINFO_RTM 0
+#endif
+
     // Hints that do not require further logic
     if (hint & kmp_lock_hint_hle)
         return KMP_TSX_LOCK(hle);
     if (hint & kmp_lock_hint_rtm)
-        return (__kmp_cpuinfo.rtm)? KMP_TSX_LOCK(rtm): __kmp_user_lock_seq;
+        return KMP_CPUINFO_RTM ? KMP_TSX_LOCK(rtm): __kmp_user_lock_seq;
     if (hint & kmp_lock_hint_adaptive)
-        return (__kmp_cpuinfo.rtm)? KMP_TSX_LOCK(adaptive): __kmp_user_lock_seq;
+        return KMP_CPUINFO_RTM ? KMP_TSX_LOCK(adaptive): __kmp_user_lock_seq;
 
     // Rule out conflicting hints first by returning the default lock
     if ((hint & omp_lock_hint_contended) && (hint & omp_lock_hint_uncontended))
         return __kmp_user_lock_seq;
     if ((hint & omp_lock_hint_speculative) && (hint & omp_lock_hint_nonspeculative))
         return __kmp_user_lock_seq;
 
     // Do not even consider speculation when it appears to be contended

openmp/trunk/runtime/src/kmp_global.c

 //
 //===----------------------------------------------------------------------===//
 
 
 #include "kmp.h"
 
 kmp_key_t __kmp_gtid_threadprivate_key;
 
+#if KMP_ARCH_X86 || KMP_ARCH_X86_64
 kmp_cpuinfo_t   __kmp_cpuinfo = { 0 }; // Not initialized
+#endif
 
 #if KMP_STATS_ENABLED
 #include "kmp_stats.h"
 // lock for modifying the global __kmp_stats_list
 kmp_tas_lock_t __kmp_stats_lock;
 
 // global list of per thread stats, the head is a sentinel node which accumulates all stats produced before __kmp_create_worker is called.
 kmp_stats_list __kmp_stats_list;