|
26 | 26 | # All valid JVM features, regardless of platform |
27 | 27 | VALID_JVM_FEATURES="compiler1 compiler2 zero minimal dtrace jvmti jvmci \ |
28 | 28 | graal vm-structs jni-check services management cmsgc epsilongc g1gc parallelgc serialgc shenandoahgc zgc nmt cds \ |
29 | | - static-build link-time-opt aot jfr" |
| 29 | + static-build link-time-opt aot jfr aiext" |
30 | 30 |
|
31 | 31 | # Deprecated JVM features (these are ignored, but with a warning) |
32 | 32 | DEPRECATED_JVM_FEATURES="trace" |
@@ -357,6 +357,10 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES], |
357 | 357 | AC_MSG_ERROR([Specified JVM feature 'cmsgc' requires feature 'serialgc']) |
358 | 358 | fi |
359 | 359 |
|
| 360 | + if HOTSPOT_CHECK_JVM_FEATURE(aiext) && ! HOTSPOT_CHECK_JVM_FEATURE(compiler2); then |
| 361 | + AC_MSG_ERROR([Specified JVM feature 'aiext' requires feature 'compiler2']) |
| 362 | + fi |
| 363 | +
|
360 | 364 | # Enable JFR by default, except for Zero, linux-sparcv9 and on minimal. |
361 | 365 | if ! HOTSPOT_CHECK_JVM_VARIANT(zero); then |
362 | 366 | if test "x$OPENJDK_TARGET_OS" != xaix; then |
@@ -518,6 +522,26 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES], |
518 | 522 |
|
519 | 523 | AC_SUBST(ENABLE_AOT) |
520 | 524 |
|
| 525 | + AC_MSG_CHECKING([if aiext should be built]) |
| 526 | + if HOTSPOT_IS_JVM_FEATURE_DISABLED(aiext); then |
| 527 | + AC_MSG_RESULT([no, forced]) |
| 528 | + JVM_FEATURES_aiext="" |
| 529 | + else |
| 530 | + # Only enable aiext on x86_64/aarch64 linux |
| 531 | + if test "x$OPENJDK_TARGET_OS" = xlinux && \ |
| 532 | + (test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \ |
| 533 | + test "x$OPENJDK_TARGET_CPU" = "xaarch64"); then |
| 534 | + AC_MSG_RESULT([yes]) |
| 535 | + JVM_FEATURES_aiext="aiext" |
| 536 | + else |
| 537 | + AC_MSG_RESULT([no]) |
| 538 | + JVM_FEATURES_aiext="" |
| 539 | + if HOTSPOT_CHECK_JVM_FEATURE(aiext); then |
| 540 | + AC_MSG_ERROR([aiext is currently not supported on this platform]) |
| 541 | + fi |
| 542 | + fi |
| 543 | + fi |
| 544 | +
|
521 | 545 | if test "x$OPENJDK_TARGET_CPU" = xarm ; then |
522 | 546 | # Default to use link time optimizations on minimal on arm |
523 | 547 | JVM_FEATURES_link_time_opt="link-time-opt" |
@@ -545,7 +569,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES], |
545 | 569 | fi |
546 | 570 |
|
547 | 571 | # Enable features depending on variant. |
548 | | - JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci $JVM_FEATURES_aot $JVM_FEATURES_graal" |
| 572 | + JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci $JVM_FEATURES_aot $JVM_FEATURES_graal $JVM_FEATURES_aiext" |
549 | 573 | JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES" |
550 | 574 | JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES" |
551 | 575 | JVM_FEATURES_minimal="compiler1 minimal serialgc $JVM_FEATURES $JVM_FEATURES_link_time_opt" |
|
0 commit comments