From: "Zhang, Jun" <jun.zh...@intel.com>
By test, we find in hybrid platform spincount 1 is better.
Use '-march=native -Ofast -funroll-loops -flto',
results as follows:
spec2017 speed RPL ADL
657.xz_s 0.00% 0.50%
603.bwaves_s 10.90% 26.20%
607.cactuBSSN_s 5.50% 72.50%
619.lbm_s 2.40% 2.50%
621.wrf_s -7.70% 2.40%
627.cam4_s 0.50% 0.70%
628.pop2_s 48.20% 153.00%
638.imagick_s -0.10% 0.20%
644.nab_s 2.30% 1.40%
649.fotonik3d_s 8.00% 13.80%
654.roms_s 1.20% 1.10%
Geomean-int 0.00% 0.50%
Geomean-fp 6.30% 21.10%
Geomean-all 5.70% 19.10%
omp2012 RPL ADL
350.md -1.81% -1.75%
351.bwaves 7.72% 12.50%
352.nab 14.63% 19.71%
357.bt331 -0.20% 1.77%
358.botsalgn 0.00% 0.00%
359.botsspar 0.00% 0.65%
360.ilbdc 0.00% 0.25%
362.fma3d 2.66% -0.51%
363.swim 10.44% 0.00%
367.imagick 0.00% 0.12%
370.mgrid331 2.49% 25.56%
371.applu331 1.06% 4.22%
372.smithwa 0.74% 3.34%
376.kdtree 10.67% 16.03%
GEOMEAN 3.34% 5.53%
include/ChangeLog:
* omphook.h: define RUNOMPHOOK macro.
libgomp/ChangeLog:
* env.c (initialize_env): add RUNOMPHOOK macro.
* config/linux/x86/omphook.h: define RUNOMPHOOK macro.
---
include/omphook.h | 1 +
libgomp/config/linux/x86/omphook.h | 19 +++++++++++++++++++
libgomp/env.c | 3 +++
3 files changed, 23 insertions(+)
create mode 100644 include/omphook.h
create mode 100644 libgomp/config/linux/x86/omphook.h
diff --git a/include/omphook.h b/include/omphook.h
new file mode 100644
index 00000000000..2ebe3ad57e6
--- /dev/null
+++ b/include/omphook.h
@@ -0,0 +1 @@
+#define RUNOMPHOOK()
diff --git a/libgomp/config/linux/x86/omphook.h
b/libgomp/config/linux/x86/omphook.h
new file mode 100644
index 00000000000..aefb311cc07
--- /dev/null
+++ b/libgomp/config/linux/x86/omphook.h
@@ -0,0 +1,19 @@
+#ifdef __x86_64__
+#include "cpuid.h"
+
+/* only for x86 hybrid platform */
+#define RUNOMPHOOK() \
+ do \
+ { \
+ unsigned int eax, ebx, ecx, edx; \
+ if ((getenv ("GOMP_SPINCOUNT") == NULL) && (wait_policy < 0) \
+ && __get_cpuid_count (7, 0, &eax, &ebx, &ecx, &edx) \
+ && ((edx >> 15) & 1)) \
+ gomp_spin_count_var = 1LL; \
+ if (gomp_throttled_spin_count_var > gomp_spin_count_var) \
+ gomp_throttled_spin_count_var = gomp_spin_count_var; \
+ } \
+ while (0)
+#else
+# include "../../../../include/omphook.h"
+#endif
diff --git a/libgomp/env.c b/libgomp/env.c
index a21adb3fd4b..1f13a148694 100644
--- a/libgomp/env.c
+++ b/libgomp/env.c
@@ -61,6 +61,7 @@
#include "secure_getenv.h"
#include "environ.h"
+#include "omphook.h"
/* Default values of ICVs according to the OpenMP standard,
except for default-device-var. */
@@ -2496,5 +2497,7 @@ initialize_env (void)
goacc_runtime_initialize ();
goacc_profiling_initialize ();
+
+ RUNOMPHOOK ();
}
#endif /* LIBGOMP_OFFLOADED_ONLY */
--
2.31.1
