1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8171008: Integrate AOT compiler into JDK

Browse Source 
Reviewed-by: erikj, mchung, twisti, simonis
This commit is contained in:
Vladimir Kozlov 2016-12-11 18:50:18 -08:00
parent 1a40cebca3
commit 2c220df590
11 changed files with 792 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/autoconf/configure.ac
View File

@ -205,7 +205,7 @@ JDKOPT_SETUP_CODE_COVERAGE
# Need toolchain to setup dtrace # Need toolchain to setup dtrace
HOTSPOT_SETUP_DTRACE HOTSPOT_SETUP_DTRACE
HOTSPOT_SETUP_JVM_FEATURES HOTSPOT_ENABLE_DISABLE_AOT
HOTSPOT_ENABLE_DISABLE_GTEST HOTSPOT_ENABLE_DISABLE_GTEST
############################################################################### ###############################################################################
@ -220,6 +220,10 @@ BASIC_COMPILE_FIXPATH
LIB_DETERMINE_DEPENDENCIES LIB_DETERMINE_DEPENDENCIES
LIB_SETUP_LIBRARIES LIB_SETUP_LIBRARIES
# Hotspot setup depends on lib checks (AOT needs libelf).
HOTSPOT_SETUP_JVM_FEATURES
############################################################################### ###############################################################################
# #
# We need to do some final tweaking, when everything else is done. # We need to do some final tweaking, when everything else is done.

689
common/autoconf/generated-configure.sh
View File

@ -654,6 +654,17 @@ NUM_CORES
ENABLE_GENERATE_CLASSLIST ENABLE_GENERATE_CLASSLIST
BUILD_FAILURE_HANDLER BUILD_FAILURE_HANDLER
ENABLE_INTREE_EC ENABLE_INTREE_EC
VALID_JVM_FEATURES
JVM_FEATURES_custom
JVM_FEATURES_zeroshark
JVM_FEATURES_zero
JVM_FEATURES_minimal
JVM_FEATURES_core
JVM_FEATURES_client
JVM_FEATURES_server
INCLUDE_GRAAL
ELF_LIBS
ELF_CFLAGS
STLPORT_LIB STLPORT_LIB
LIBZIP_CAN_USE_MMAP LIBZIP_CAN_USE_MMAP
LIBDL LIBDL
@ -692,15 +703,7 @@ LIBCXX
FIXPATH_DETACH_FLAG FIXPATH_DETACH_FLAG
FIXPATH FIXPATH
BUILD_GTEST BUILD_GTEST
VALID_JVM_FEATURES ENABLE_AOT
JVM_FEATURES_custom
JVM_FEATURES_zeroshark
JVM_FEATURES_zero
JVM_FEATURES_minimal
JVM_FEATURES_core
JVM_FEATURES_client
JVM_FEATURES_server
INCLUDE_GRAAL
INCLUDE_DTRACE INCLUDE_DTRACE
GCOV_ENABLED GCOV_ENABLED
ZIP_EXTERNAL_DEBUG_SYMBOLS ZIP_EXTERNAL_DEBUG_SYMBOLS
@ -1186,8 +1189,7 @@ enable_debug_symbols
enable_zip_debug_info enable_zip_debug_info
enable_native_coverage enable_native_coverage
enable_dtrace enable_dtrace
with_jvm_features enable_aot
with_jvm_interpreter
enable_hotspot_gtest enable_hotspot_gtest
with_stdc__lib with_stdc__lib
with_msvcr_dll with_msvcr_dll
@ -1215,6 +1217,11 @@ with_lcms
with_dxsdk with_dxsdk
with_dxsdk_lib with_dxsdk_lib
with_dxsdk_include with_dxsdk_include
with_libelf
with_libelf_include
with_libelf_lib
with_jvm_features
with_jvm_interpreter
enable_jtreg_failure_handler enable_jtreg_failure_handler
enable_generate_classlist enable_generate_classlist
with_num_cores with_num_cores
@ -1339,6 +1346,8 @@ PNG_CFLAGS
PNG_LIBS PNG_LIBS
LCMS_CFLAGS LCMS_CFLAGS
LCMS_LIBS LCMS_LIBS
ELF_CFLAGS
ELF_LIBS
ICECC_CMD ICECC_CMD
ICECC_CREATE_ENV ICECC_CREATE_ENV
ICECC_WRAPPER ICECC_WRAPPER
@ -1984,6 +1993,10 @@ Optional Features:
--enable-dtrace[=yes/no/auto] --enable-dtrace[=yes/no/auto]
enable dtrace. Default is auto, where dtrace is enable dtrace. Default is auto, where dtrace is
enabled if all dependencies are present. enabled if all dependencies are present.
--enable-aot[=yes/no/auto]
enable ahead of time compilation feature. Default is
auto, where aot is enabled if all dependencies are
present.
--disable-hotspot-gtest Disables building of the Hotspot unit tests --disable-hotspot-gtest Disables building of the Hotspot unit tests
--disable-freetype-bundling --disable-freetype-bundling
disable bundling of the freetype library with the disable bundling of the freetype library with the
@ -2111,10 +2124,6 @@ Optional Packages:
--with-native-debug-symbols --with-native-debug-symbols
set the native debug symbol configuration (none, set the native debug symbol configuration (none,
internal, external, zipped) [varying] internal, external, zipped) [varying]
--with-jvm-features additional JVM features to enable (separated by
comma), use '--help' to show possible values [none]
--with-jvm-interpreter Deprecated. Option is kept for backwards
compatibility and is ignored
--with-stdc++lib=<static>,<dynamic>,<default> --with-stdc++lib=<static>,<dynamic>,<default>
force linking of the C++ runtime on Linux to either force linking of the C++ runtime on Linux to either
static or dynamic, default is static with dynamic as static or dynamic, default is static with dynamic as
@ -2161,6 +2170,15 @@ Optional Packages:
compatibility and is ignored compatibility and is ignored
--with-dxsdk-include Deprecated. Option is kept for backwards --with-dxsdk-include Deprecated. Option is kept for backwards
compatibility and is ignored compatibility and is ignored
--with-libelf specify prefix directory for the libelf package
(expecting the libraries under PATH/lib and the
headers under PATH/include)
--with-libelf-include specify directory for the libelf include files
--with-libelf-lib specify directory for the libelf library
--with-jvm-features additional JVM features to enable (separated by
comma), use '--help' to show possible values [none]
--with-jvm-interpreter Deprecated. Option is kept for backwards
compatibility and is ignored
--with-num-cores number of cores in the build system, e.g. --with-num-cores number of cores in the build system, e.g.
--with-num-cores=8 [probed] --with-num-cores=8 [probed]
--with-memory-size memory (in MB) available in the build system, e.g. --with-memory-size memory (in MB) available in the build system, e.g.
@ -2290,6 +2308,8 @@ Some influential environment variables:
PNG_LIBS linker flags for PNG, overriding pkg-config PNG_LIBS linker flags for PNG, overriding pkg-config
LCMS_CFLAGS C compiler flags for LCMS, overriding pkg-config LCMS_CFLAGS C compiler flags for LCMS, overriding pkg-config
LCMS_LIBS linker flags for LCMS, overriding pkg-config LCMS_LIBS linker flags for LCMS, overriding pkg-config
ELF_CFLAGS C compiler flags for ELF, overriding pkg-config
ELF_LIBS linker flags for ELF, overriding pkg-config
ICECC_CMD Override default value for ICECC_CMD ICECC_CMD Override default value for ICECC_CMD
ICECC_CREATE_ENV ICECC_CREATE_ENV
Override default value for ICECC_CREATE_ENV Override default value for ICECC_CREATE_ENV
@ -4177,6 +4197,8 @@ apt_help() {
PKGHANDLER_COMMAND="sudo apt-get install ccache" ;; PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
dtrace) dtrace)
PKGHANDLER_COMMAND="sudo apt-get install systemtap-sdt-dev" ;; PKGHANDLER_COMMAND="sudo apt-get install systemtap-sdt-dev" ;;
elf)
PKGHANDLER_COMMAND="sudo apt-get install libelf-dev" ;;
esac esac
} }
@ -4196,6 +4218,8 @@ yum_help() {
PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel libXi-devel" ;; PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel libXi-devel" ;;
ccache) ccache)
PKGHANDLER_COMMAND="sudo yum install ccache" ;; PKGHANDLER_COMMAND="sudo yum install ccache" ;;
elf)
PKGHANDLER_COMMAND="sudo yum install elfutils-libelf-devel" ;;
esac esac
} }
@ -4248,7 +4272,7 @@ pkgadd_help() {
# All valid JVM features, regardless of platform # All valid JVM features, regardless of platform
VALID_JVM_FEATURES="compiler1 compiler2 zero shark minimal dtrace jvmti jvmci \ VALID_JVM_FEATURES="compiler1 compiler2 zero shark minimal dtrace jvmti jvmci \
graal fprof vm-structs jni-check services management all-gcs nmt cds static-build" graal fprof vm-structs jni-check services management all-gcs nmt cds static-build aot"
# All valid JVM variants # All valid JVM variants
VALID_JVM_VARIANTS="server client minimal core zero zeroshark custom" VALID_JVM_VARIANTS="server client minimal core zero zeroshark custom"
@ -4292,6 +4316,11 @@ VALID_JVM_VARIANTS="server client minimal core zero zeroshark custom"
# #
################################################################################
# Check if AOT should be enabled
#
############################################################################### ###############################################################################
# Set up all JVM features for each JVM variant. # Set up all JVM features for each JVM variant.
# #
@ -4715,6 +4744,36 @@ VALID_JVM_VARIANTS="server client minimal core zero zeroshark custom"
################################################################################ ################################################################################
#
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# This code 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
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
# questions.
#
################################################################################
# Setup libelf (ELF library)
################################################################################
################################################################################ ################################################################################
# Determine which libraries are needed for this configuration # Determine which libraries are needed for this configuration
@ -5083,7 +5142,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE #CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks: # Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1481486918 DATE_WHEN_GENERATED=1481496095
############################################################################### ###############################################################################
# #
@ -52694,141 +52753,54 @@ $as_echo "yes, dependencies present" >&6; }
# The user can in some cases supply additional jvm features. For the custom # Check whether --enable-aot was given.
# variant, this defines the entire variant. if test "${enable_aot+set}" = set; then :
enableval=$enable_aot;
# Check whether --with-jvm-features was given.
if test "${with_jvm_features+set}" = set; then :
withval=$with_jvm_features;
fi fi
if test "x$with_jvm_features" != x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking additional JVM features" >&5
$as_echo_n "checking additional JVM features... " >&6; }
JVM_FEATURES=`$ECHO $with_jvm_features | $SED -e 's/,/ /g'`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $JVM_FEATURES" >&5
$as_echo "$JVM_FEATURES" >&6; }
fi
# Verify that dependencies are met for explicitly set features. if test "x$enable_aot" = "x" || test "x$enable_aot" = "xauto"; then
if [[ " $JVM_FEATURES " =~ " jvmti " ]] && ! [[ " $JVM_FEATURES " =~ " services " ]] ; then ENABLE_AOT="true"
as_fn_error $? "Specified JVM feature 'jvmti' requires feature 'services'" "$LINENO" 5 elif test "x$enable_aot" = "xyes"; then
fi ENABLE_AOT="true"
elif test "x$enable_aot" = "xno"; then
if [[ " $JVM_FEATURES " =~ " management " ]] && ! [[ " $JVM_FEATURES " =~ " nmt " ]] ; then ENABLE_AOT="false"
as_fn_error $? "Specified JVM feature 'management' requires feature 'nmt'" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if aot should be enabled" >&5
fi $as_echo_n "checking if aot should be enabled... " >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no, forced" >&5
if [[ " $JVM_FEATURES " =~ " jvmci " ]] && ! ( [[ " $JVM_FEATURES " =~ " compiler1 " ]] || [[ " $JVM_FEATURES " =~ " compiler2 " ]] ); then $as_echo "no, forced" >&6; }
as_fn_error $? "Specified JVM feature 'jvmci' requires feature 'compiler2' or 'compiler1'" "$LINENO" 5
fi
if [[ " $JVM_FEATURES " =~ " compiler2 " ]] && ! [[ " $JVM_FEATURES " =~ " all-gcs " ]] ; then
as_fn_error $? "Specified JVM feature 'compiler2' requires feature 'all-gcs'" "$LINENO" 5
fi
if [[ " $JVM_FEATURES " =~ " vm-structs " ]] && ! [[ " $JVM_FEATURES " =~ " all-gcs " ]] ; then
as_fn_error $? "Specified JVM feature 'vm-structs' requires feature 'all-gcs'" "$LINENO" 5
fi
# Turn on additional features based on other parts of configure
if test "x$INCLUDE_DTRACE" = "xtrue"; then
JVM_FEATURES="$JVM_FEATURES dtrace"
else else
if [[ " $JVM_FEATURES " =~ " dtrace " ]] ; then as_fn_error $? "Invalid value for --enable-aot: $enable_aot" "$LINENO" 5
as_fn_error $? "To enable dtrace, you must use --enable-dtrace" "$LINENO" 5
fi
fi fi
if test "x$STATIC_BUILD" = "xtrue"; then if test "x$ENABLE_AOT" = "xtrue"; then
JVM_FEATURES="$JVM_FEATURES static-build" # Only enable AOT on linux-X64.
else if test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-x86_64"; then
if [[ " $JVM_FEATURES " =~ " static-build " ]] ; then if test -e "$HOTSPOT_TOPDIR/src/jdk.aot"; then
as_fn_error $? "To enable static-build, you must use --enable-static-build" "$LINENO" 5 if test -e "$HOTSPOT_TOPDIR/src/jdk.vm.compiler"; then
fi ENABLE_AOT="true"
fi else
ENABLE_AOT="false"
if ! [[ " $JVM_VARIANTS " =~ " zero " ]] && ! [[ " $JVM_VARIANTS " =~ " zeroshark " ]] ; then if test "x$enable_aot" = "xyes"; then
if [[ " $JVM_FEATURES " =~ " zero " ]] ; then as_fn_error $? "Cannot build AOT without hotspot/src/jdk.vm.compiler sources. Remove --enable-aot." "$LINENO" 5
as_fn_error $? "To enable zero/zeroshark, you must use --with-jvm-variants=zero/zeroshark" "$LINENO" 5 fi
fi fi
fi else
ENABLE_AOT="false"
if ! [[ " $JVM_VARIANTS " =~ " zeroshark " ]] ; then if test "x$enable_aot" = "xyes"; then
if [[ " $JVM_FEATURES " =~ " shark " ]] ; then as_fn_error $? "Cannot build AOT without hotspot/src/jdk.aot sources. Remove --enable-aot." "$LINENO" 5
as_fn_error $? "To enable shark, you must use --with-jvm-variants=zeroshark" "$LINENO" 5 fi
fi fi
fi
# Only enable jvmci on x86_64, sparcv9 and aarch64.
if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \
test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \
test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
JVM_FEATURES_jvmci="jvmci"
else
JVM_FEATURES_jvmci=""
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if jdk.vm.compiler should be built" >&5
$as_echo_n "checking if jdk.vm.compiler should be built... " >&6; }
if [[ " $JVM_FEATURES " =~ " graal " ]] ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, forced" >&5
$as_echo "yes, forced" >&6; }
if test "x$JVM_FEATURES_jvmci" != "xjvmci" ; then
as_fn_error $? "Specified JVM feature 'graal' requires feature 'jvmci'" "$LINENO" 5
fi
INCLUDE_GRAAL="true"
else
# By default enable graal build on linux-X64 and when JVMCI is available
if test "x$JVM_FEATURES_jvmci" = "xjvmci" && test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-x86_64"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
JVM_FEATURES_graal="graal"
INCLUDE_GRAAL="true"
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ENABLE_AOT="false"
$as_echo "no" >&6; } if test "x$enable_aot" = "xyes"; then
JVM_FEATURES_graal="" as_fn_error $? "AOT is currently only supported on Linux-x86_64. Remove --enable-aot." "$LINENO" 5
INCLUDE_GRAAL="false" fi
fi fi
fi fi
# All variants but minimal (and custom) get these features
NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti fprof vm-structs jni-check services management all-gcs nmt cds"
# Enable features depending on variant.
JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci $JVM_FEATURES_graal"
JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci"
JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES"
JVM_FEATURES_minimal="compiler1 minimal $JVM_FEATURES"
JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES"
JVM_FEATURES_zeroshark="zero shark $NON_MINIMAL_FEATURES $JVM_FEATURES"
JVM_FEATURES_custom="$JVM_FEATURES"
# Used for verification of Makefiles by check-jvm-feature
# We don't support --with-jvm-interpreter anymore, use zero instead.
# Check whether --with-jvm-interpreter was given.
if test "${with_jvm_interpreter+set}" = set; then :
withval=$with_jvm_interpreter; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-jvm-interpreter is deprecated and will be ignored." >&5
$as_echo "$as_me: WARNING: Option --with-jvm-interpreter is deprecated and will be ignored." >&2;}
fi
# Check whether --enable-hotspot-gtest was given. # Check whether --enable-hotspot-gtest was given.
if test "${enable_hotspot_gtest+set}" = set; then : if test "${enable_hotspot_gtest+set}" = set; then :
@ -63794,6 +63766,275 @@ $as_echo "no, not found at $STLPORT_LIB" >&6; }
# Check whether --with-libelf was given.
if test "${with_libelf+set}" = set; then :
withval=$with_libelf;
fi
# Check whether --with-libelf-include was given.
if test "${with_libelf_include+set}" = set; then :
withval=$with_libelf_include;
fi
# Check whether --with-libelf-lib was given.
if test "${with_libelf_lib+set}" = set; then :
withval=$with_libelf_lib;
fi
if test "x$ENABLE_AOT" = xfalse; then
if (test "x${with_libelf}" != x && test "x${with_libelf}" != xno) || \
(test "x${with_libelf_include}" != x && test "x${with_libelf_include}" != xno) || \
(test "x${with_libelf_lib}" != x && test "x${with_libelf_lib}" != xno); then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libelf is not used, so --with-libelf[-*] is ignored" >&5
$as_echo "$as_me: WARNING: libelf is not used, so --with-libelf[-*] is ignored" >&2;}
fi
LIBELF_CFLAGS=
LIBELF_LIBS=
else
LIBELF_FOUND=no
if test "x${with_libelf}" = xno || test "x${with_libelf_include}" = xno || test "x${with_libelf_lib}" = xno; then
ENABLE_AOT="false"
if test "x${enable_aot}" = xyes; then
as_fn_error $? "libelf is explicitly disabled, cannot build AOT. Enable libelf or remove --enable-aot to disable AOT." "$LINENO" 5
fi
else
if test "x${with_libelf}" != x; then
ELF_LIBS="-L${with_libelf}/lib -lelf"
ELF_CFLAGS="-I${with_libelf}/include"
LIBELF_FOUND=yes
fi
if test "x${with_libelf_include}" != x; then
ELF_CFLAGS="-I${with_libelf_include}"
LIBELF_FOUND=yes
fi
if test "x${with_libelf_lib}" != x; then
ELF_LIBS="-L${with_libelf_lib} -lelf"
LIBELF_FOUND=yes
fi
# Do not try pkg-config if we have a sysroot set.
if test "x$SYSROOT" = x; then
if test "x$LIBELF_FOUND" = xno; then
# Figure out ELF_CFLAGS and ELF_LIBS
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ELF" >&5
$as_echo_n "checking for ELF... " >&6; }
if test -n "$ELF_CFLAGS"; then
pkg_cv_ELF_CFLAGS="$ELF_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelf\""; } >&5
($PKG_CONFIG --exists --print-errors "libelf") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_ELF_CFLAGS=`$PKG_CONFIG --cflags "libelf" 2>/dev/null`
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test -n "$ELF_LIBS"; then
pkg_cv_ELF_LIBS="$ELF_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libelf\""; } >&5
($PKG_CONFIG --exists --print-errors "libelf") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_ELF_LIBS=`$PKG_CONFIG --libs "libelf" 2>/dev/null`
else
pkg_failed=yes
fi
else
pkg_failed=untried
fi
if test $pkg_failed = yes; then
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
ELF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libelf" 2>&1`
else
ELF_PKG_ERRORS=`$PKG_CONFIG --print-errors "libelf" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$ELF_PKG_ERRORS" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
LIBELF_FOUND=no
elif test $pkg_failed = untried; then
LIBELF_FOUND=no
else
ELF_CFLAGS=$pkg_cv_ELF_CFLAGS
ELF_LIBS=$pkg_cv_ELF_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
LIBELF_FOUND=yes
fi
fi
fi
if test "x$LIBELF_FOUND" = xno; then
for ac_header in libelf.h
do :
ac_fn_cxx_check_header_mongrel "$LINENO" "libelf.h" "ac_cv_header_libelf_h" "$ac_includes_default"
if test "x$ac_cv_header_libelf_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBELF_H 1
_ACEOF
LIBELF_FOUND=yes
ELF_CFLAGS=
ELF_LIBS=-lelf
else
LIBELF_FOUND=no
fi
done
fi
if test "x$LIBELF_FOUND" = xno; then
ENABLE_AOT="false"
# Print a helpful message on how to acquire the necessary build dependency.
# elf is the help tag: freetype, cups, alsa etc
MISSING_DEPENDENCY=elf
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
cygwin_help $MISSING_DEPENDENCY
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
msys_help $MISSING_DEPENDENCY
else
PKGHANDLER_COMMAND=
case $PKGHANDLER in
apt-get)
apt_help $MISSING_DEPENDENCY ;;
yum)
yum_help $MISSING_DEPENDENCY ;;
port)
port_help $MISSING_DEPENDENCY ;;
pkgutil)
pkgutil_help $MISSING_DEPENDENCY ;;
pkgadd)
pkgadd_help $MISSING_DEPENDENCY ;;
esac
if test "x$PKGHANDLER_COMMAND" != x; then
HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
fi
fi
if test "x${enable_aot}" = xyes; then
as_fn_error $? "libelf not found, cannot build AOT. Remove --enable-aot to disable AOT or: $HELP_MSG" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libelf not found, cannot build AOT. $HELP_MSG" >&5
$as_echo "$as_me: WARNING: libelf not found, cannot build AOT. $HELP_MSG" >&2;}
fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libelf works" >&5
$as_echo_n "checking if libelf works... " >&6; }
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
OLD_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $ELF_CFLAGS"
OLD_LIBS="$LIBS"
LIBS="$LIBS $ELF_LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <libelf.h>
int
main ()
{
elf_version(0);
return 0;
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
LIBELF_WORKS=yes
else
LIBELF_WORKS=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$OLD_CFLAGS"
LIBS="$OLD_LIBS"
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBELF_WORKS" >&5
$as_echo "$LIBELF_WORKS" >&6; }
if test "x$LIBELF_WORKS" = xno; then
ENABLE_AOT="false"
# Print a helpful message on how to acquire the necessary build dependency.
# elf is the help tag: freetype, cups, alsa etc
MISSING_DEPENDENCY=elf
if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
cygwin_help $MISSING_DEPENDENCY
elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
msys_help $MISSING_DEPENDENCY
else
PKGHANDLER_COMMAND=
case $PKGHANDLER in
apt-get)
apt_help $MISSING_DEPENDENCY ;;
yum)
yum_help $MISSING_DEPENDENCY ;;
port)
port_help $MISSING_DEPENDENCY ;;
pkgutil)
pkgutil_help $MISSING_DEPENDENCY ;;
pkgadd)
pkgadd_help $MISSING_DEPENDENCY ;;
esac
if test "x$PKGHANDLER_COMMAND" != x; then
HELP_MSG="You might be able to fix this by running '$PKGHANDLER_COMMAND'."
fi
fi
if test "x$enable_aot" = "xyes"; then
as_fn_error $? "Found libelf but could not link and compile with it. Remove --enable-aot to disable AOT or: $HELP_MSG" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Found libelf but could not link and compile with it. $HELP_MSG" >&5
$as_echo "$as_me: WARNING: Found libelf but could not link and compile with it. $HELP_MSG" >&2;}
fi
fi
fi
fi
fi
@ -63805,6 +64046,174 @@ $as_echo "no, not found at $STLPORT_LIB" >&6; }
# Hotspot setup depends on lib checks (AOT needs libelf).
# The user can in some cases supply additional jvm features. For the custom
# variant, this defines the entire variant.
# Check whether --with-jvm-features was given.
if test "${with_jvm_features+set}" = set; then :
withval=$with_jvm_features;
fi
if test "x$with_jvm_features" != x; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking additional JVM features" >&5
$as_echo_n "checking additional JVM features... " >&6; }
JVM_FEATURES=`$ECHO $with_jvm_features | $SED -e 's/,/ /g'`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $JVM_FEATURES" >&5
$as_echo "$JVM_FEATURES" >&6; }
fi
# Verify that dependencies are met for explicitly set features.
if [[ " $JVM_FEATURES " =~ " jvmti " ]] && ! [[ " $JVM_FEATURES " =~ " services " ]] ; then
as_fn_error $? "Specified JVM feature 'jvmti' requires feature 'services'" "$LINENO" 5
fi
if [[ " $JVM_FEATURES " =~ " management " ]] && ! [[ " $JVM_FEATURES " =~ " nmt " ]] ; then
as_fn_error $? "Specified JVM feature 'management' requires feature 'nmt'" "$LINENO" 5
fi
if [[ " $JVM_FEATURES " =~ " jvmci " ]] && ! ( [[ " $JVM_FEATURES " =~ " compiler1 " ]] || [[ " $JVM_FEATURES " =~ " compiler2 " ]] ); then
as_fn_error $? "Specified JVM feature 'jvmci' requires feature 'compiler2' or 'compiler1'" "$LINENO" 5
fi
if [[ " $JVM_FEATURES " =~ " compiler2 " ]] && ! [[ " $JVM_FEATURES " =~ " all-gcs " ]] ; then
as_fn_error $? "Specified JVM feature 'compiler2' requires feature 'all-gcs'" "$LINENO" 5
fi
if [[ " $JVM_FEATURES " =~ " vm-structs " ]] && ! [[ " $JVM_FEATURES " =~ " all-gcs " ]] ; then
as_fn_error $? "Specified JVM feature 'vm-structs' requires feature 'all-gcs'" "$LINENO" 5
fi
# Turn on additional features based on other parts of configure
if test "x$INCLUDE_DTRACE" = "xtrue"; then
JVM_FEATURES="$JVM_FEATURES dtrace"
else
if [[ " $JVM_FEATURES " =~ " dtrace " ]] ; then
as_fn_error $? "To enable dtrace, you must use --enable-dtrace" "$LINENO" 5
fi
fi
if test "x$STATIC_BUILD" = "xtrue"; then
JVM_FEATURES="$JVM_FEATURES static-build"
else
if [[ " $JVM_FEATURES " =~ " static-build " ]] ; then
as_fn_error $? "To enable static-build, you must use --enable-static-build" "$LINENO" 5
fi
fi
if ! [[ " $JVM_VARIANTS " =~ " zero " ]] && ! [[ " $JVM_VARIANTS " =~ " zeroshark " ]] ; then
if [[ " $JVM_FEATURES " =~ " zero " ]] ; then
as_fn_error $? "To enable zero/zeroshark, you must use --with-jvm-variants=zero/zeroshark" "$LINENO" 5
fi
fi
if ! [[ " $JVM_VARIANTS " =~ " zeroshark " ]] ; then
if [[ " $JVM_FEATURES " =~ " shark " ]] ; then
as_fn_error $? "To enable shark, you must use --with-jvm-variants=zeroshark" "$LINENO" 5
fi
fi
# Only enable jvmci on x86_64, sparcv9 and aarch64.
if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \
test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \
test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
JVM_FEATURES_jvmci="jvmci"
else
JVM_FEATURES_jvmci=""
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if jdk.vm.compiler should be built" >&5
$as_echo_n "checking if jdk.vm.compiler should be built... " >&6; }
if [[ " $JVM_FEATURES " =~ " graal " ]] ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, forced" >&5
$as_echo "yes, forced" >&6; }
if test "x$JVM_FEATURES_jvmci" != "xjvmci" ; then
as_fn_error $? "Specified JVM feature 'graal' requires feature 'jvmci'" "$LINENO" 5
fi
INCLUDE_GRAAL="true"
else
# By default enable graal build where AOT is available
if test "x$ENABLE_AOT" = "xtrue"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
JVM_FEATURES_graal="graal"
INCLUDE_GRAAL="true"
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
JVM_FEATURES_graal=""
INCLUDE_GRAAL="false"
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if aot should be enabled" >&5
$as_echo_n "checking if aot should be enabled... " >&6; }
if test "x$ENABLE_AOT" = "xtrue"; then
if test "x$enable_aot" = "xyes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, forced" >&5
$as_echo "yes, forced" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
fi
JVM_FEATURES_aot="aot"
else
if test "x$enable_aot" = "xno"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no, forced" >&5
$as_echo "no, forced" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
JVM_FEATURES_aot=""
fi
# All variants but minimal (and custom) get these features
NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti fprof vm-structs jni-check services management all-gcs nmt cds"
# Enable features depending on variant.
JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci $JVM_FEATURES_aot $JVM_FEATURES_graal"
JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci"
JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES"
JVM_FEATURES_minimal="compiler1 minimal $JVM_FEATURES"
JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES"
JVM_FEATURES_zeroshark="zero shark $NON_MINIMAL_FEATURES $JVM_FEATURES"
JVM_FEATURES_custom="$JVM_FEATURES"
# Used for verification of Makefiles by check-jvm-feature
# We don't support --with-jvm-interpreter anymore, use zero instead.
# Check whether --with-jvm-interpreter was given.
if test "${with_jvm_interpreter+set}" = set; then :
withval=$with_jvm_interpreter; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Option --with-jvm-interpreter is deprecated and will be ignored." >&5
$as_echo "$as_me: WARNING: Option --with-jvm-interpreter is deprecated and will be ignored." >&2;}
fi
############################################################################### ###############################################################################
# #
# We need to do some final tweaking, when everything else is done. # We need to do some final tweaking, when everything else is done.

4
common/autoconf/help.m4
View File

@ -121,6 +121,8 @@ apt_help() {
PKGHANDLER_COMMAND="sudo apt-get install ccache" ;; PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
dtrace) dtrace)
PKGHANDLER_COMMAND="sudo apt-get install systemtap-sdt-dev" ;; PKGHANDLER_COMMAND="sudo apt-get install systemtap-sdt-dev" ;;
elf)
PKGHANDLER_COMMAND="sudo apt-get install libelf-dev" ;;
esac esac
} }
@ -140,6 +142,8 @@ yum_help() {
PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel libXi-devel" ;; PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel libXi-devel" ;;
ccache) ccache)
PKGHANDLER_COMMAND="sudo yum install ccache" ;; PKGHANDLER_COMMAND="sudo yum install ccache" ;;
elf)
PKGHANDLER_COMMAND="sudo yum install elfutils-libelf-devel" ;;
esac esac
} }

74
common/autoconf/hotspot.m4
View File

@ -25,7 +25,7 @@
# All valid JVM features, regardless of platform # All valid JVM features, regardless of platform
VALID_JVM_FEATURES="compiler1 compiler2 zero shark minimal dtrace jvmti jvmci \ VALID_JVM_FEATURES="compiler1 compiler2 zero shark minimal dtrace jvmti jvmci \
graal fprof vm-structs jni-check services management all-gcs nmt cds static-build" graal fprof vm-structs jni-check services management all-gcs nmt cds static-build aot"
# All valid JVM variants # All valid JVM variants
VALID_JVM_VARIANTS="server client minimal core zero zeroshark custom" VALID_JVM_VARIANTS="server client minimal core zero zeroshark custom"
@ -189,6 +189,55 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_DTRACE],
AC_SUBST(INCLUDE_DTRACE) AC_SUBST(INCLUDE_DTRACE)
]) ])
################################################################################
# Check if AOT should be enabled
#
AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_AOT],
[
AC_ARG_ENABLE([aot], [AS_HELP_STRING([--enable-aot@<:@=yes/no/auto@:>@],
[enable ahead of time compilation feature. Default is auto, where aot is enabled if all dependencies are present.])])
if test "x$enable_aot" = "x" || test "x$enable_aot" = "xauto"; then
ENABLE_AOT="true"
elif test "x$enable_aot" = "xyes"; then
ENABLE_AOT="true"
elif test "x$enable_aot" = "xno"; then
ENABLE_AOT="false"
AC_MSG_CHECKING([if aot should be enabled])
AC_MSG_RESULT([no, forced])
else
AC_MSG_ERROR([Invalid value for --enable-aot: $enable_aot])
fi
if test "x$ENABLE_AOT" = "xtrue"; then
# Only enable AOT on linux-X64.
if test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-x86_64"; then
if test -e "$HOTSPOT_TOPDIR/src/jdk.aot"; then
if test -e "$HOTSPOT_TOPDIR/src/jdk.vm.compiler"; then
ENABLE_AOT="true"
else
ENABLE_AOT="false"
if test "x$enable_aot" = "xyes"; then
AC_MSG_ERROR([Cannot build AOT without hotspot/src/jdk.vm.compiler sources. Remove --enable-aot.])
fi
fi
else
ENABLE_AOT="false"
if test "x$enable_aot" = "xyes"; then
AC_MSG_ERROR([Cannot build AOT without hotspot/src/jdk.aot sources. Remove --enable-aot.])
fi
fi
else
ENABLE_AOT="false"
if test "x$enable_aot" = "xyes"; then
AC_MSG_ERROR([AOT is currently only supported on Linux-x86_64. Remove --enable-aot.])
fi
fi
fi
AC_SUBST(ENABLE_AOT)
])
############################################################################### ###############################################################################
# Set up all JVM features for each JVM variant. # Set up all JVM features for each JVM variant.
# #
@ -271,8 +320,8 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
fi fi
INCLUDE_GRAAL="true" INCLUDE_GRAAL="true"
else else
# By default enable graal build on linux-X64 and when JVMCI is available # By default enable graal build where AOT is available
if test "x$JVM_FEATURES_jvmci" = "xjvmci" && test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-x86_64"; then if test "x$ENABLE_AOT" = "xtrue"; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
JVM_FEATURES_graal="graal" JVM_FEATURES_graal="graal"
INCLUDE_GRAAL="true" INCLUDE_GRAAL="true"
@ -285,11 +334,28 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
AC_SUBST(INCLUDE_GRAAL) AC_SUBST(INCLUDE_GRAAL)
AC_MSG_CHECKING([if aot should be enabled])
if test "x$ENABLE_AOT" = "xtrue"; then
if test "x$enable_aot" = "xyes"; then
AC_MSG_RESULT([yes, forced])
else
AC_MSG_RESULT([yes])
fi
JVM_FEATURES_aot="aot"
else
if test "x$enable_aot" = "xno"; then
AC_MSG_RESULT([no, forced])
else
AC_MSG_RESULT([no])
fi
JVM_FEATURES_aot=""
fi
# All variants but minimal (and custom) get these features # All variants but minimal (and custom) get these features
NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti fprof vm-structs jni-check services management all-gcs nmt cds" NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES jvmti fprof vm-structs jni-check services management all-gcs nmt cds"
# Enable features depending on variant. # Enable features depending on variant.
JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci $JVM_FEATURES_graal" JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci $JVM_FEATURES_aot $JVM_FEATURES_graal"
JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci" JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci"
JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES" JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES"
JVM_FEATURES_minimal="compiler1 minimal $JVM_FEATURES" JVM_FEATURES_minimal="compiler1 minimal $JVM_FEATURES"

129
common/autoconf/lib-elf.m4 Normal file
View File

@ -0,0 +1,129 @@
#
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation. Oracle designates this
# particular file as subject to the "Classpath" exception as provided
# by Oracle in the LICENSE file that accompanied this code.
#
# This code 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
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
# questions.
#
################################################################################
# Setup libelf (ELF library)
################################################################################
AC_DEFUN_ONCE([LIB_SETUP_LIBELF],
[
AC_ARG_WITH(libelf, [AS_HELP_STRING([--with-libelf],
[specify prefix directory for the libelf package
(expecting the libraries under PATH/lib and the headers under PATH/include)])])
AC_ARG_WITH(libelf-include, [AS_HELP_STRING([--with-libelf-include],
[specify directory for the libelf include files])])
AC_ARG_WITH(libelf-lib, [AS_HELP_STRING([--with-libelf-lib],
[specify directory for the libelf library])])
if test "x$ENABLE_AOT" = xfalse; then
if (test "x${with_libelf}" != x && test "x${with_libelf}" != xno) || \
(test "x${with_libelf_include}" != x && test "x${with_libelf_include}" != xno) || \
(test "x${with_libelf_lib}" != x && test "x${with_libelf_lib}" != xno); then
AC_MSG_WARN([[libelf is not used, so --with-libelf[-*] is ignored]])
fi
LIBELF_CFLAGS=
LIBELF_LIBS=
else
LIBELF_FOUND=no
if test "x${with_libelf}" = xno || test "x${with_libelf_include}" = xno || test "x${with_libelf_lib}" = xno; then
ENABLE_AOT="false"
if test "x${enable_aot}" = xyes; then
AC_MSG_ERROR([libelf is explicitly disabled, cannot build AOT. Enable libelf or remove --enable-aot to disable AOT.])
fi
else
if test "x${with_libelf}" != x; then
ELF_LIBS="-L${with_libelf}/lib -lelf"
ELF_CFLAGS="-I${with_libelf}/include"
LIBELF_FOUND=yes
fi
if test "x${with_libelf_include}" != x; then
ELF_CFLAGS="-I${with_libelf_include}"
LIBELF_FOUND=yes
fi
if test "x${with_libelf_lib}" != x; then
ELF_LIBS="-L${with_libelf_lib} -lelf"
LIBELF_FOUND=yes
fi
# Do not try pkg-config if we have a sysroot set.
if test "x$SYSROOT" = x; then
if test "x$LIBELF_FOUND" = xno; then
# Figure out ELF_CFLAGS and ELF_LIBS
PKG_CHECK_MODULES([ELF], [libelf], [LIBELF_FOUND=yes], [LIBELF_FOUND=no])
fi
fi
if test "x$LIBELF_FOUND" = xno; then
AC_CHECK_HEADERS([libelf.h],
[
LIBELF_FOUND=yes
ELF_CFLAGS=
ELF_LIBS=-lelf
],
[LIBELF_FOUND=no]
)
fi
if test "x$LIBELF_FOUND" = xno; then
ENABLE_AOT="false"
HELP_MSG_MISSING_DEPENDENCY([elf])
if test "x${enable_aot}" = xyes; then
AC_MSG_ERROR([libelf not found, cannot build AOT. Remove --enable-aot to disable AOT or: $HELP_MSG])
else
AC_MSG_WARN([libelf not found, cannot build AOT. $HELP_MSG])
fi
else
AC_MSG_CHECKING([if libelf works])
AC_LANG_PUSH(C)
OLD_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $ELF_CFLAGS"
OLD_LIBS="$LIBS"
LIBS="$LIBS $ELF_LIBS"
AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <libelf.h>],
[
elf_version(0);
return 0;
])],
[LIBELF_WORKS=yes],
[LIBELF_WORKS=no]
)
CFLAGS="$OLD_CFLAGS"
LIBS="$OLD_LIBS"
AC_LANG_POP(C)
AC_MSG_RESULT([$LIBELF_WORKS])
if test "x$LIBELF_WORKS" = xno; then
ENABLE_AOT="false"
HELP_MSG_MISSING_DEPENDENCY([elf])
if test "x$enable_aot" = "xyes"; then
AC_MSG_ERROR([Found libelf but could not link and compile with it. Remove --enable-aot to disable AOT or: $HELP_MSG])
else
AC_MSG_WARN([Found libelf but could not link and compile with it. $HELP_MSG])
fi
fi
fi
fi
fi
AC_SUBST(ELF_CFLAGS)
AC_SUBST(ELF_LIBS)
])

2
common/autoconf/libraries.m4
View File

@ -31,6 +31,7 @@ m4_include([lib-ffi.m4])
m4_include([lib-freetype.m4]) m4_include([lib-freetype.m4])
m4_include([lib-std.m4]) m4_include([lib-std.m4])
m4_include([lib-x11.m4]) m4_include([lib-x11.m4])
m4_include([lib-elf.m4])
################################################################################ ################################################################################
# Determine which libraries are needed for this configuration # Determine which libraries are needed for this configuration
@ -90,6 +91,7 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBRARIES],
LIB_SETUP_BUNDLED_LIBS LIB_SETUP_BUNDLED_LIBS
LIB_SETUP_MISC_LIBS LIB_SETUP_MISC_LIBS
LIB_SETUP_SOLARIS_STLPORT LIB_SETUP_SOLARIS_STLPORT
LIB_SETUP_LIBELF
]) ])
################################################################################ ################################################################################

3
common/autoconf/spec.gmk.in
View File

@ -683,6 +683,7 @@ TAR_INCLUDE_PARAM:=@TAR_INCLUDE_PARAM@
TAR_SUPPORTS_TRANSFORM:=@TAR_SUPPORTS_TRANSFORM@ TAR_SUPPORTS_TRANSFORM:=@TAR_SUPPORTS_TRANSFORM@
# Build setup # Build setup
ENABLE_AOT:=@ENABLE_AOT@
ENABLE_JFR=@ENABLE_JFR@ ENABLE_JFR=@ENABLE_JFR@
ENABLE_INTREE_EC=@ENABLE_INTREE_EC@ ENABLE_INTREE_EC=@ENABLE_INTREE_EC@
USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@ USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@
@ -757,6 +758,8 @@ USE_EXTERNAL_LIBPNG:=@USE_EXTERNAL_LIBPNG@
PNG_LIBS:=@PNG_LIBS@ PNG_LIBS:=@PNG_LIBS@
PNG_CFLAGS:=@PNG_CFLAGS@ PNG_CFLAGS:=@PNG_CFLAGS@
ELF_CFLAGS:=@ELF_CFLAGS@
ELF_LIBS:=@ELF_LIBS@
#################################################### ####################################################
# #

12
make/CompileJavaModules.gmk
View File

@ -492,6 +492,10 @@ jdk.vm.compiler_EXCLUDES += \
################################################################################ ################################################################################
jdk.aot_ADD_JAVAC_FLAGS := -parameters -XDstringConcat=inline
################################################################################
jdk.xml.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS jdk.xml.bind_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
jdk.xml.bind_CLEAN := .properties jdk.xml.bind_CLEAN := .properties
jdk.xml.bind_COPY := .xsd JAXBContextFactory.java ZeroOneBooleanAdapter.java jdk.xml.bind_COPY := .xsd JAXBContextFactory.java ZeroOneBooleanAdapter.java
@ -559,6 +563,14 @@ ifeq ($(MODULE), jdk.vm.compiler)
MODULESOURCEPATH := $(call PathList, $(VM_COMPILER_MODULESOURCEPATH)) MODULESOURCEPATH := $(call PathList, $(VM_COMPILER_MODULESOURCEPATH))
endif endif
ifeq ($(MODULE), jdk.aot)
## WORKAROUND jdk.aot source structure issue
AOT_MODULESOURCEPATH := $(MODULESOURCEPATH) \
$(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
$(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src)))
MODULESOURCEPATH := $(call PathList, $(AOT_MODULESOURCEPATH))
endif
$(eval $(call SetupJavaCompilation, $(MODULE), \ $(eval $(call SetupJavaCompilation, $(MODULE), \
SETUP := $(if $($(MODULE)_SETUP), $($(MODULE)_SETUP), GENERATE_JDKBYTECODE), \ SETUP := $(if $($(MODULE)_SETUP), $($(MODULE)_SETUP), GENERATE_JDKBYTECODE), \
MODULE := $(MODULE), \ MODULE := $(MODULE), \

9
make/common/Modules.gmk
View File

@ -145,12 +145,19 @@ ifeq ($(INCLUDE_SA), false)
endif endif
################################################################################ ################################################################################
# Filter out specific modules # Filter out Graal specific modules if Graal build is disabled
ifeq ($(INCLUDE_GRAAL), false) ifeq ($(INCLUDE_GRAAL), false)
MODULES_FILTER += jdk.vm.compiler MODULES_FILTER += jdk.vm.compiler
endif endif
################################################################################
# Filter out aot specific modules if aot is disabled
ifeq ($(ENABLE_AOT), false)
MODULES_FILTER += jdk.aot
endif
################################################################################ ################################################################################
# Module list macros # Module list macros

6
test/lib/sun/hotspot/WhiteBox.java
View File

@ -229,7 +229,7 @@ public class WhiteBox {
return isMethodCompiled0(method, isOsr); return isMethodCompiled0(method, isOsr);
} }
public boolean isMethodCompilable(Executable method) { public boolean isMethodCompilable(Executable method) {
return isMethodCompilable(method, -1 /*any*/); return isMethodCompilable(method, -2 /*any*/);
} }
public boolean isMethodCompilable(Executable method, int compLevel) { public boolean isMethodCompilable(Executable method, int compLevel) {
return isMethodCompilable(method, compLevel, false /*not osr*/); return isMethodCompilable(method, compLevel, false /*not osr*/);
@ -277,7 +277,7 @@ public class WhiteBox {
return deoptimizeMethod0(method, isOsr); return deoptimizeMethod0(method, isOsr);
} }
public void makeMethodNotCompilable(Executable method) { public void makeMethodNotCompilable(Executable method) {
makeMethodNotCompilable(method, -1 /*any*/); makeMethodNotCompilable(method, -2 /*any*/);
} }
public void makeMethodNotCompilable(Executable method, int compLevel) { public void makeMethodNotCompilable(Executable method, int compLevel) {
makeMethodNotCompilable(method, compLevel, false /*not osr*/); makeMethodNotCompilable(method, compLevel, false /*not osr*/);
@ -301,7 +301,7 @@ public class WhiteBox {
return testSetDontInlineMethod0(method, value); return testSetDontInlineMethod0(method, value);
} }
public int getCompileQueuesSize() { public int getCompileQueuesSize() {
return getCompileQueueSize(-1 /*any*/); return getCompileQueueSize(-2 /*any*/);
} }
public native int getCompileQueueSize(int compLevel); public native int getCompileQueueSize(int compLevel);
private native boolean testSetForceInlineMethod0(Executable method, boolean value); private native boolean testSetForceInlineMethod0(Executable method, boolean value);

9
test/lib/sun/hotspot/code/CodeBlob.java
View File

@ -49,8 +49,13 @@ public class CodeBlob {
assert obj.length == 4; assert obj.length == 4;
name = (String) obj[0]; name = (String) obj[0];
size = (Integer) obj[1]; size = (Integer) obj[1];
code_blob_type = BlobType.values()[(Integer) obj[2]]; int blob_type_index = (Integer) obj[2];
assert code_blob_type.id == (Integer) obj[2]; if (blob_type_index == -1) { // AOT
code_blob_type = null;
} else {
code_blob_type = BlobType.values()[blob_type_index];
assert code_blob_type.id == (Integer) obj[2];
}
address = (Long) obj[3]; address = (Long) obj[3];
} }
public final String name; public final String name;