[Openmp-commits] [openmp] facb89a - [openmp] __kmp_x86_cpuid fix for i386/PIC builds. (#84626)
via Openmp-commits
openmp-commits at lists.llvm.org
Mon Mar 11 06:15:47 PDT 2024
Author: David CARLIER
Date: 2024-03-11T13:15:43Z
New Revision: facb89ae1228c067b2b14f32e7e70608fe50704b
URL: https://github.com/llvm/llvm-project/commit/facb89ae1228c067b2b14f32e7e70608fe50704b
DIFF: https://github.com/llvm/llvm-project/commit/facb89ae1228c067b2b14f32e7e70608fe50704b.diff
LOG: [openmp] __kmp_x86_cpuid fix for i386/PIC builds. (#84626)
Added:
Modified:
openmp/runtime/src/kmp.h
Removed:
################################################################################
diff --git a/openmp/runtime/src/kmp.h b/openmp/runtime/src/kmp.h
index 6510dd9b3561d3..48d7124e56c57c 100644
--- a/openmp/runtime/src/kmp.h
+++ b/openmp/runtime/src/kmp.h
@@ -1404,9 +1404,19 @@ extern void __kmp_query_cpuid(kmp_cpuinfo_t *p);
// subleaf is only needed for cache and topology discovery and can be set to
// zero in most cases
static inline void __kmp_x86_cpuid(int leaf, int subleaf, struct kmp_cpuid *p) {
+#if KMP_ARCH_X86 && (defined(__pic__) || defined(__PIC__))
+ // on i386 arch, the ebx reg. is used by pic, thus we need to preserve from
+ // being trashed beforehand
+ __asm__ __volatile__("mov %%ebx, %%edi\n"
+ "cpuid\n"
+ "xchg %%edi, %%ebx\n"
+ : "=a"(p->eax), "=b"(p->ebx), "=c"(p->ecx), "=d"(p->edx)
+ : "a"(leaf), "c"(subleaf));
+#else
__asm__ __volatile__("cpuid"
: "=a"(p->eax), "=b"(p->ebx), "=c"(p->ecx), "=d"(p->edx)
: "a"(leaf), "c"(subleaf));
+#endif
}
// Load p into FPU control word
static inline void __kmp_load_x87_fpu_control_word(const kmp_int16 *p) {
More information about the Openmp-commits
mailing list