Merge pull request #137 from tajila/openj9

Add JFR flags
ibmruntimes · Mar 27, 2024 · 5c69317 · 5c69317
2 parents 17e0926 + a4ac405
commit 5c69317
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 6 deletions.
diff --git a/closed/OpenJ9.gmk b/closed/OpenJ9.gmk
@@ -1,5 +1,5 @@
 # ===========================================================================
-# (c) Copyright IBM Corp. 2017, 2023 All Rights Reserved
+# (c) Copyright IBM Corp. 2017, 2024 All Rights Reserved
 # ===========================================================================
 # 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
@@ -272,6 +272,13 @@ else
  SPEC_SED_SCRIPT += $(call SedDisable,module_ddr)
 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 JITServer enablement flags.
 ifeq (true,$(OPENJ9_ENABLE_JITSERVER))
  FEATURE_SED_SCRIPT += $(call SedEnable,opt_jitserver)
@@ -432,6 +439,12 @@ ifeq (true,$(OPENJ9_ENABLE_CMAKE))
  CMAKE_ARGS += -DCMAKE_CXX_COMPILER_LAUNCHER="$(ESCAPED_CCACHE)"
  endif # CCACHE
 
+ 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_JITSERVER))
  CMAKE_ARGS += -DJ9VM_OPT_JITSERVER=ON
 
@@ -461,7 +474,7 @@ 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

diff --git a/closed/autoconf/custom-hook.m4 b/closed/autoconf/custom-hook.m4
@@ -1,5 +1,5 @@
 # ===========================================================================
-# (c) Copyright IBM Corp. 2017, 2023 All Rights Reserved
+# (c) Copyright IBM Corp. 2017, 2024 All Rights Reserved
 # ===========================================================================
 # 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
@@ -47,10 +47,11 @@ AC_DEFUN_ONCE([CUSTOM_EARLY_HOOK],
  OPENJ9_CONFIGURE_DDR
  OPENJ9_CONFIGURE_DEMOS
  OPENJ9_CONFIGURE_HEALTHCENTER
+ OPENJ9_CONFIGURE_INLINE_TYPES
+ OPENJ9_CONFIGURE_JFR
+ OPENJ9_CONFIGURE_JITSERVER
  OPENJ9_CONFIGURE_NUMA
  OPENJ9_CONFIGURE_WARNINGS
- OPENJ9_CONFIGURE_JITSERVER
- OPENJ9_CONFIGURE_INLINE_TYPES
  OPENJ9_THIRD_PARTY_REQUIREMENTS
  OPENJ9_CHECK_NASM_VERSION
  OPENJCEPLUS_SETUP
@@ -412,6 +413,34 @@ AC_DEFUN([OPENJ9_CONFIGURE_INLINE_TYPES],
  AC_SUBST(OPENJ9_ENABLE_INLINE_TYPES)
 ])
 
+AC_DEFUN([OPENJ9_CONFIGURE_JFR],
+[
+ AC_ARG_ENABLE([jfr], [AS_HELP_STRING([--enable-jfr], [enable JFR support @<:@platform dependent@:>@])])
+
+ AC_MSG_CHECKING([for jfr])
+ OPENJ9_ENABLE_JFR=false
+ if test "x$enable_jfr" = xyes ; then
+ AC_MSG_RESULT([yes (explicitly enabled)])
+ OPENJ9_ENABLE_JFR=true
+ elif test "x$enable_jfr" = xno ; then
+ AC_MSG_RESULT([no (explicitly disabled)])
+ elif test "x$enable_jfr" = 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_JITSERVER],
 [
  AC_ARG_ENABLE([jitserver], [AS_HELP_STRING([--enable-jitserver], [enable JITServer support @<:@disabled@:>@])])

diff --git a/closed/autoconf/custom-spec.gmk.in b/closed/autoconf/custom-spec.gmk.in
@@ -1,5 +1,5 @@
 # ===========================================================================
-# (c) Copyright IBM Corp. 2017, 2023 All Rights Reserved
+# (c) Copyright IBM Corp. 2017, 2024 All Rights Reserved
 # ===========================================================================
 # 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
@@ -75,6 +75,7 @@ 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@
 
 # for constructing version output