|
 |
67e3c5 |
# HG changeset patch
|
|
|
67e3c5 |
# User sgehwolf
|
|
|
67e3c5 |
# Date 1536142767 -7200
|
|
|
67e3c5 |
# Wed Sep 05 12:19:27 2018 +0200
|
|
|
67e3c5 |
# Node ID 7ea57274e55054579d1532e757edb21e67beed83
|
|
|
67e3c5 |
# Parent 3ee91722550680c18b977f0e00b1013323b5c9ef
|
|
|
67e3c5 |
8210416: [linux] Poor StrictMath performance due to non-optimized compilation
|
|
|
67e3c5 |
Summary: Compile fdlibm with -O2 -ffp-contract=off on gcc/clang arches.
|
|
|
67e3c5 |
Reviewed-by: aph, erikj, dholmes, darcy
|
|
|
67e3c5 |
|
|
|
67e3c5 |
diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
|
|
|
67e3c5 |
--- a/make/autoconf/flags-cflags.m4
|
|
|
67e3c5 |
+++ b/make/autoconf/flags-cflags.m4
|
|
|
67e3c5 |
@@ -366,6 +366,18 @@
|
|
|
67e3c5 |
|
|
|
67e3c5 |
FLAGS_SETUP_CFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_])
|
|
|
67e3c5 |
|
|
|
67e3c5 |
+ COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off"
|
|
|
67e3c5 |
+ # Check that the compiler supports -ffp-contract=off flag
|
|
|
67e3c5 |
+ # Set FDLIBM_CFLAGS to -ffp-contract=off if it does. Empty
|
|
|
67e3c5 |
+ # otherwise.
|
|
|
67e3c5 |
+ # These flags are required for GCC-based builds of
|
|
|
67e3c5 |
+ # fdlibm with optimization without losing precision.
|
|
|
67e3c5 |
+ # Notably, -ffp-contract=off needs to be added for GCC >= 4.6.
|
|
|
67e3c5 |
+ FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${COMPILER_FP_CONTRACT_OFF_FLAG}],
|
|
|
67e3c5 |
+ IF_TRUE: [FDLIBM_CFLAGS=${COMPILER_FP_CONTRACT_OFF_FLAG}],
|
|
|
67e3c5 |
+ IF_FALSE: [FDLIBM_CFLAGS=""])
|
|
|
67e3c5 |
+ AC_SUBST(FDLIBM_CFLAGS)
|
|
|
67e3c5 |
+
|
|
|
67e3c5 |
# Tests are only ever compiled for TARGET
|
|
|
67e3c5 |
CFLAGS_TESTLIB="$CFLAGS_JDKLIB"
|
|
|
67e3c5 |
CXXFLAGS_TESTLIB="$CXXFLAGS_JDKLIB"
|
|
|
67e3c5 |
diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
|
|
|
67e3c5 |
--- a/make/autoconf/spec.gmk.in
|
|
|
67e3c5 |
+++ b/make/autoconf/spec.gmk.in
|
|
|
67e3c5 |
@@ -444,6 +444,7 @@
|
|
|
67e3c5 |
LIBJSIG_HASHSTYLE_LDFLAGS := @LIBJSIG_HASHSTYLE_LDFLAGS@
|
|
|
67e3c5 |
LIBJSIG_NOEXECSTACK_LDFLAGS := @LIBJSIG_NOEXECSTACK_LDFLAGS@
|
|
|
67e3c5 |
|
|
|
67e3c5 |
+FDLIBM_CFLAGS := @FDLIBM_CFLAGS@
|
|
|
67e3c5 |
JVM_CFLAGS := @JVM_CFLAGS@
|
|
|
67e3c5 |
JVM_LDFLAGS := @JVM_LDFLAGS@
|
|
|
67e3c5 |
JVM_ASFLAGS := @JVM_ASFLAGS@
|
|
|
67e3c5 |
diff --git a/make/lib/CoreLibraries.gmk b/make/lib/CoreLibraries.gmk
|
|
|
67e3c5 |
--- a/make/lib/CoreLibraries.gmk
|
|
|
67e3c5 |
+++ b/make/lib/CoreLibraries.gmk
|
|
|
67e3c5 |
@@ -39,20 +39,15 @@
|
|
|
67e3c5 |
BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
|
|
|
67e3c5 |
endif
|
|
|
67e3c5 |
|
|
|
67e3c5 |
-ifeq ($(OPENJDK_TARGET_OS), linux)
|
|
|
67e3c5 |
- ifeq ($(OPENJDK_TARGET_CPU), ppc64)
|
|
|
67e3c5 |
- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
|
|
|
67e3c5 |
- else ifeq ($(OPENJDK_TARGET_CPU), ppc64le)
|
|
|
67e3c5 |
- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
|
|
|
67e3c5 |
- else ifeq ($(OPENJDK_TARGET_CPU), s390x)
|
|
|
67e3c5 |
- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
|
|
|
67e3c5 |
- else ifeq ($(OPENJDK_TARGET_CPU), aarch64)
|
|
|
67e3c5 |
- BUILD_LIBFDLIBM_OPTIMIZATION := HIGH
|
|
|
67e3c5 |
- endif
|
|
|
67e3c5 |
+# If FDLIBM_CFLAGS is non-empty we know that we can optimize
|
|
|
67e3c5 |
+# fdlibm by adding those extra C flags. Currently GCC,
|
|
|
67e3c5 |
+# and clang only.
|
|
|
67e3c5 |
+ifneq ($(FDLIBM_CFLAGS), )
|
|
|
67e3c5 |
+ BUILD_LIBFDLIBM_OPTIMIZATION := LOW
|
|
|
67e3c5 |
endif
|
|
|
67e3c5 |
|
|
|
67e3c5 |
LIBFDLIBM_SRC := $(TOPDIR)/src/java.base/share/native/libfdlibm
|
|
|
67e3c5 |
-LIBFDLIBM_CFLAGS := -I$(LIBFDLIBM_SRC)
|
|
|
67e3c5 |
+LIBFDLIBM_CFLAGS := -I$(LIBFDLIBM_SRC) $(FDLIBM_CFLAGS)
|
|
|
67e3c5 |
|
|
|
67e3c5 |
ifneq ($(OPENJDK_TARGET_OS), macosx)
|
|
|
67e3c5 |
$(eval $(call SetupNativeCompilation, BUILD_LIBFDLIBM, \
|
|
|
67e3c5 |
@@ -64,10 +59,6 @@
|
|
|
67e3c5 |
CFLAGS := $(CFLAGS_JDKLIB) $(LIBFDLIBM_CFLAGS), \
|
|
|
67e3c5 |
CFLAGS_windows_debug := -DLOGGING, \
|
|
|
67e3c5 |
CFLAGS_aix := -qfloat=nomaf, \
|
|
|
67e3c5 |
- CFLAGS_linux_ppc64 := -ffp-contract=off, \
|
|
|
67e3c5 |
- CFLAGS_linux_ppc64le := -ffp-contract=off, \
|
|
|
67e3c5 |
- CFLAGS_linux_s390x := -ffp-contract=off, \
|
|
|
67e3c5 |
- CFLAGS_linux_aarch64 := -ffp-contract=off, \
|
|
|
67e3c5 |
DISABLED_WARNINGS_gcc := sign-compare misleading-indentation array-bounds, \
|
|
|
67e3c5 |
DISABLED_WARNINGS_microsoft := 4146 4244 4018, \
|
|
|
67e3c5 |
ARFLAGS := $(ARFLAGS), \
|