diff options
| -rw-r--r-- | include/spincount.h | 33 | ||||
| -rw-r--r-- | libgomp/config/linux/x86/spincount.h | 49 | ||||
| -rw-r--r-- | libgomp/env.c | 6 |
3 files changed, 87 insertions, 1 deletions
diff --git a/include/spincount.h b/include/spincount.h new file mode 100644 index 0000000..9eecfff --- /dev/null +++ b/include/spincount.h @@ -0,0 +1,33 @@ +/* Copyright (C) 2023-2023 Free Software Foundation, Inc. + Contributed by Jun Zhang <jun.zhang@intel.com>. + + This file is part of the GNU Offloading and Multi Processing Library + (libgomp). + + Libgomp is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + Libgomp is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + Under Section 7 of GPL version 3, you are granted additional + permissions described in the GCC Runtime Library Exception, version + 3.1, as published by the Free Software Foundation. + + You should have received a copy of the GNU General Public License and + a copy of the GCC Runtime Library Exception along with this program; + see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + <http://www.gnu.org/licenses/>. */ + +#ifndef GOMP_SPINCOUNT_H +#define GOMP_SPINCOUNT_H 1 + +static inline void do_adjust_default_spincount (void) +{ +} + +#endif /* GOMP_SPINCOUNT_H */ diff --git a/libgomp/config/linux/x86/spincount.h b/libgomp/config/linux/x86/spincount.h new file mode 100644 index 0000000..9d2624f --- /dev/null +++ b/libgomp/config/linux/x86/spincount.h @@ -0,0 +1,49 @@ +/* Copyright (C) 2023-2023 Free Software Foundation, Inc. + Contributed by Jun Zhang <jun.zhang@intel.com>. + + This file is part of the GNU Offloading and Multi Processing Library + (libgomp). + + Libgomp is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3, or (at your option) + any later version. + + Libgomp is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU General Public License for + more details. + + Under Section 7 of GPL version 3, you are granted additional + permissions described in the GCC Runtime Library Exception, version + 3.1, as published by the Free Software Foundation. + + You should have received a copy of the GNU General Public License and + a copy of the GCC Runtime Library Exception along with this program; + see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + <http://www.gnu.org/licenses/>. */ + +#ifndef GOMP_SPINCOUNT_H +#define GOMP_SPINCOUNT_H 1 + +#ifdef __x86_64__ +#include "cpuid.h" +#include "libgomp.h" + +/* Only for x86 hybrid platform */ +static inline void do_adjust_default_spincount (void) +{ + unsigned int eax, ebx, ecx, edx; + if (__get_cpuid_count (7, 0, &eax, &ebx, &ecx, &edx) + /* CPUID.07H.0H:EDX[15] Hybrid. */ + && ((edx >> 15) & 1)) + gomp_spin_count_var = 1LL; +} +#else + +static inline void do_adjust_default_spincount (void) +{ +} +#endif + +#endif /* GOMP_SPINCOUNT_H */ diff --git a/libgomp/env.c b/libgomp/env.c index a21adb3..d058043 100644 --- a/libgomp/env.c +++ b/libgomp/env.c @@ -61,6 +61,7 @@ #include "secure_getenv.h" #include "environ.h" +#include "spincount.h" /* Default values of ICVs according to the OpenMP standard, except for default-device-var. */ @@ -2431,7 +2432,10 @@ initialize_env (void) if (wait_policy > 0) gomp_spin_count_var = 30000000000LL; else if (wait_policy < 0) - gomp_spin_count_var = 300000LL; + { + gomp_spin_count_var = 300000LL; + do_adjust_default_spincount (); + } } /* gomp_throttled_spin_count_var is used when there are more libgomp managed threads than available CPUs. Use very short spinning. */ |