Skip to content

Commit

Permalink
Add JFR flags
Browse files Browse the repository at this point in the history
Signed-off-by: Tobi Ajila <[email protected]>
  • Loading branch information
tajila committed Mar 22, 2024
1 parent 131ff59 commit 10f819f
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 6 deletions.
15 changes: 14 additions & 1 deletion closed/OpenJ9.gmk
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,13 @@ else
FEATURE_SED_SCRIPT += $(call SedDisable,opt_jitserver)
endif

# Adjust JFR enablement flags.
ifeq (true,$(OPENJ9_ENABLE_JFR))
FEATURE_SED_SCRIPT += $(call SedEnable,opt_jfr)
else
FEATURE_SED_SCRIPT += $(call SedDisable,opt_jfr)
endif

# Adjust Inline-Types enablement flags.
ifeq (true,$(OPENJ9_ENABLE_INLINE_TYPES))
SPEC_SED_SCRIPT += $(call SedEnable,opt_valhallaValueTypes)
Expand Down Expand Up @@ -462,13 +469,19 @@ ifeq (true,$(OPENJ9_ENABLE_CMAKE))
else # OPENJ9_ENABLE_INLINE_TYPES
CMAKE_ARGS += -DJ9VM_OPT_VALHALLA_VALUE_TYPES=OFF
endif # OPENJ9_ENABLE_INLINE_TYPES

ifeq (true,$(OPENJ9_ENABLE_CRAC_SUPPORT))
CMAKE_ARGS += -DJ9VM_OPT_CRAC_SUPPORT=ON
else # OPENJ9_ENABLE_CRAC_SUPPORT
CMAKE_ARGS += -DJ9VM_OPT_CRAC_SUPPORT=OFF
endif # OPENJ9_ENABLE_CRAC_SUPPORT

ifeq (true,$(OPENJ9_ENABLE_JFR))
CMAKE_ARGS += -DJ9VM_OPT_JFR=ON
else # OPENJ9_ENABLE_JFR
CMAKE_ARGS += -DJ9VM_OPT_JFR=OFF
endif # OPENJ9_ENABLE_JFR

ifeq (true,$(OPENJ9_ENABLE_CRIU_SUPPORT))
CMAKE_ARGS += -DJ9VM_OPT_CRIU_SUPPORT=ON
else # OPENJ9_ENABLE_CRIU_SUPPORT
Expand Down
37 changes: 33 additions & 4 deletions closed/autoconf/custom-hook.m4
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,15 @@ AC_DEFUN_ONCE([CUSTOM_EARLY_HOOK],
OPENJ9_CONFIGURE_CUDA
OPENJ9_CONFIGURE_DDR
OPENJ9_CONFIGURE_DEMOS
OPENJ9_CONFIGURE_HEALTHCENTER
OPENJ9_CONFIGURE_NUMA
OPENJ9_CONFIGURE_WARNINGS
OPENJ9_CONFIGURE_JFR
OPENJ9_CONFIGURE_JITSERVER
OPENJ9_CONFIGURE_HEALTHCENTER
OPENJ9_CONFIGURE_INLINE_TYPES
OPENJ9_THIRD_PARTY_REQUIREMENTS
OPENJ9_CHECK_NASM_VERSION
OPENJ9_CONFIGURE_NUMA
OPENJ9_THIRD_PARTY_REQUIREMENTS
OPENJCEPLUS_SETUP
OPENJ9_CONFIGURE_WARNINGS
])

AC_DEFUN([OPENJ9_CONFIGURE_CMAKE],
Expand Down Expand Up @@ -445,6 +446,34 @@ AC_DEFUN([OPENJ9_CONFIGURE_JITSERVER],
AC_SUBST(OPENJ9_ENABLE_JITSERVER)
])

AC_DEFUN([OPENJ9_CONFIGURE_JFR],
[
AC_ARG_ENABLE([jfr], [AS_HELP_STRING([--enable-jfr], [enable JFR support @<:@disabled@:>@])])
AC_MSG_CHECKING([for jfr])
OPENJ9_ENABLE_JITSERVER=false
if test "x$enable_jfr" = xyes ; then
AC_MSG_RESULT([yes (explicitly enabled)])
OPENJ9_ENABLE_JFR=true
elif test "x$enable_jitserver" = xno ; then
AC_MSG_RESULT([no (explicitly disabled)])
elif test "x$enable_jitserver" = x ; then
case "$OPENJ9_PLATFORM_CODE" in
xa64)
AC_MSG_RESULT([yes (default)])
OPENJ9_ENABLE_JFR=true
;;
*)
AC_MSG_RESULT([no (default)])
;;
esac
else
AC_MSG_ERROR([--enable-jfr accepts no argument])
fi
AC_SUBST(OPENJ9_ENABLE_JFR)
])

AC_DEFUN([OPENJ9_CONFIGURE_CONTINUATION_PROFILE],
[
AC_MSG_CHECKING([for Continuation profiling])
Expand Down
3 changes: 2 additions & 1 deletion closed/autoconf/custom-spec.gmk.in
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,9 @@ OPENJ9_ENABLE_CRAC_SUPPORT := @OPENJ9_ENABLE_CRAC_SUPPORT@
OPENJ9_ENABLE_CRIU_SUPPORT := @OPENJ9_ENABLE_CRIU_SUPPORT@
OPENJ9_ENABLE_DDR := @OPENJ9_ENABLE_DDR@
OPENJ9_ENABLE_DEMOS := @OPENJ9_ENABLE_DEMOS@
OPENJ9_ENABLE_INLINE_TYPES := @OPENJ9_ENABLE_INLINE_TYPES@
OPENJ9_ENABLE_JFR := @OPENJ9_ENABLE_JFR@
OPENJ9_ENABLE_JITSERVER := @OPENJ9_ENABLE_JITSERVER@
OPENJ9_ENABLE_INLINE_TYPES := @OPENJ9_ENABLE_INLINE_TYPES@

# for constructing version output
COMPILER_VERSION_STRING := @COMPILER_VERSION_STRING@
Expand Down

0 comments on commit 10f819f

Please sign in to comment.