Add changelog entries. Cleanups and minor improvements to compiler control.

Author: chumer

sdk/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 This changelog summarizes major changes between GraalVM SDK versions. The main focus is on APIs exported by GraalVM SDK.
 
+## Version 25.0.0
+* GR-60636 Truffle now stops compiling when the code cache fills up on HotSpot. A warning is printed when that happens.
+
 ## Version 24.2.0
 * GR-54905 When using Truffle NFI with the Panama backend, native access must now be granted to the Truffle module instead of the NFI Panama module. Use the `--enable-native-access=org.graalvm.truffle` Java command line option to enable the native access for the NFI Panama backend.
 * GR-57681 Added the ability to use `Value#as(byte[].class)` to copy the contents of a guest language byte buffer (`Value#hasBufferElements()`) to a new byte array. The new functionality has precedence over accessing the guest object as array (`Value#hasArrayElements()`) if both ways are available. 

truffle/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 This changelog summarizes major changes between Truffle versions relevant to languages implementors building upon the Truffle framework. The main focus is on APIs exported by Truffle.
 
+## Version 24.2.0
+* GR-60636 Truffle now stops compiling when the code cache fills up on HotSpot. A warning is printed when that happens.
+
 ## Version 24.2.0
 * GR-57658 Added `TruffleLanguage.Env.getLanguageInfo(Class<? extends TruffleLanguage>)` to lookup a `LanguageInfo` instance for a language class returned by `InteropLibrary.getLanguage(Object)`.
 * GR-57164 Added support for reading unaligned ints, shorts and long to `ByteArraySupport`.

truffle/docs/Options.md

@@ -81,6 +81,7 @@ The accepted values are:
 - `--engine.PartialBlockMaximumSize=[1, inf)` : Sets the maximum non-trivial Truffle node size for partial compilation of BlockNode nodes (default: 10000).
 - `--engine.SingleTierCompilationThreshold=[1, inf)` : Minimum number of invocations or loop iterations needed to compile a guest language root when not using multi tier (default: 1000).
 - `--engine.Splitting=true|false` : Enable automatic duplication of compilation profiles (splitting) (default: true).
+- `--engine.StoppedCompilationRetryDelay=<ms>` : Before the Truffle runtime submits an OptimizedCallTarget for compilation, it checks for the compilation activity mode in the host VM. If the activity mode indicates a full code cache, no new compilation requests are submitted and the compilation queue is flushed. After 'StoppedCompilationRetryDelay' milliseconds new compilations will be submitted again (which might trigger a sweep of the code cache and a reset of the compilation activity mode in the host JVM). The option is only supported on the HotSpot Truffle runtime. On runtimes which don't support it the option has no effect. default: 5000
 - `--engine.TraceCompilation` : Print information for compilation results.
 - `--compiler.EncodedGraphCache` : Cache encoded graphs across Truffle compilations to speed up partial evaluation. (default: true).
 - `--compiler.FirstTierUseEconomy` : Whether to use the economy configuration in the first-tier compilations. (default: true, syntax: true|false)

truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/OptimizedCallTarget.java

@@ -859,25 +859,24 @@ final boolean isCompilationFailed() {
         return compilationFailed;
     }
 
-    final CompilationActivityMode getCompilationActivityMode() {
+    private CompilationActivityMode getCompilationActivityMode() {
         CompilationActivityMode compilationActivityMode = runtime().getCompilationActivityMode();
-        long sct = runtime().stoppedCompilationTime().get();
+        long stoppedTime = runtime().stoppedCompilationTime().get();
         if (compilationActivityMode == CompilationActivityMode.STOP_COMPILATION) {
-            if (sct != 0 && System.currentTimeMillis() - sct > engine.stoppedCompilationRetryDelay) {
-                runtime().stoppedCompilationTime().compareAndSet(sct, 0);
+            if (stoppedTime != 0 && System.currentTimeMillis() - stoppedTime > engine.stoppedCompilationRetryDelay) {
+                runtime().stoppedCompilationTime().compareAndSet(stoppedTime, 0);
                 // Try again every StoppedCompilationRetryDelay milliseconds to potentially trigger
                 // a code cache sweep.
                 compilationActivityMode = CompilationActivityMode.RUN_COMPILATION;
             }
         }
 
         switch (compilationActivityMode) {
-            case RUN_COMPILATION: {
+            case RUN_COMPILATION:
                 // This is the common case - compilations are not stopped.
                 return CompilationActivityMode.RUN_COMPILATION;
-            }
-            case STOP_COMPILATION: {
-                if (sct == 0) {
+            case STOP_COMPILATION:
+                if (stoppedTime == 0) {
                     runtime().stoppedCompilationTime().compareAndSet(0, System.currentTimeMillis());
                 }
                 // Flush the compilations queue for now. There's still a chance that compilation
@@ -892,8 +891,7 @@ final CompilationActivityMode getCompilationActivityMode() {
                     }
                 }
                 return CompilationActivityMode.STOP_COMPILATION;
-            }
-            case SHUTDOWN_COMPILATION: {
+            case SHUTDOWN_COMPILATION:
                 // Compilation was shut down permanently because the hosts code cache ran full and
                 // the host was configured without support for code cache sweeping.
                 TruffleLogger logger = engine.getLogger("engine");
@@ -908,11 +906,9 @@ final CompilationActivityMode getCompilationActivityMode() {
                     target.compilationFailed = true;
                 }
                 return CompilationActivityMode.SHUTDOWN_COMPILATION;
-            }
             default:
-                CompilerDirectives.shouldNotReachHere("Invalid compilation activity mode: " + compilationActivityMode);
+                throw CompilerDirectives.shouldNotReachHere("Invalid compilation activity mode: " + compilationActivityMode);
         }
-        return CompilationActivityMode.RUN_COMPILATION;
     }
 
     /**

truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/OptimizedTruffleRuntime.java

@@ -1490,30 +1490,25 @@ static OptionCategory matchCategory(TruffleCompilerOptionDescriptor d) {
         }
     }
 
-    /**
-     * Represents HotSpot's compilation activity mode which is one of: {@code stop_compilation = 0},
-     * {@code run_compilation = 1} or {@code shutdown_compilation = 2}. Should be in sync with the
-     * {@code CompilerActivity} enum in {@code hotspot/share/compiler/compileBroker.hpp}.
-     */
     public enum CompilationActivityMode {
-        STOP_COMPILATION,
+        /**
+         * Process compilations regularly.
+         */
         RUN_COMPILATION,
+        /**
+         * Stop compilations temporarily.
+         */
+        STOP_COMPILATION,
+        /**
+         * Shutdown compilations permanently.
+         */
         SHUTDOWN_COMPILATION;
-
-        public static CompilationActivityMode fromInteger(int i) {
-            return switch (i) {
-                case 0 -> STOP_COMPILATION;
-                case 1 -> RUN_COMPILATION;
-                case 2 -> SHUTDOWN_COMPILATION;
-                default -> throw new RuntimeException("Invalid CompilationActivityMode " + i);
-            };
-        }
     }
 
     /**
      * Returns the current host compilation activity mode. The default is to run compilations.
      */
-    public CompilationActivityMode getCompilationActivityMode() {
+    protected CompilationActivityMode getCompilationActivityMode() {
         return CompilationActivityMode.RUN_COMPILATION;
     }
 }

truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/hotspot/HotSpotTruffleRuntime.java

@@ -695,7 +695,7 @@ public boolean isLibGraalCompilationEnabled() {
         return compilationSupport instanceof LibGraalTruffleCompilationSupport;
     }
 
-    static final MethodHandle getCompilationActivityMode;
+    private static final MethodHandle getCompilationActivityMode;
     static {
         MethodHandle mHandle = null;
         try {
@@ -711,15 +711,29 @@ public boolean isLibGraalCompilationEnabled() {
      * Returns the current host compilation activity mode based on HotSpot's code cache state.
      */
     @Override
-    public CompilationActivityMode getCompilationActivityMode() {
+    protected CompilationActivityMode getCompilationActivityMode() {
         int activityMode = 1; // Default is to run compilations
         if (getCompilationActivityMode != null) {
             try {
                 activityMode = (int) getCompilationActivityMode.invokeExact(HotSpotJVMCIRuntime.runtime());
             } catch (Throwable t) {
-                throw new RuntimeException("Can't get HotSpot's compilation activity mode", t);
+                throw CompilerDirectives.shouldNotReachHere("Can't get HotSpot's compilation activity mode", t);
             }
         }
-        return CompilationActivityMode.fromInteger(activityMode);
+        return resolveHotSpotActivityMode(activityMode);
+    }
+
+    /**
+     * Represents HotSpot's compilation activity mode which is one of: {@code stop_compilation = 0},
+     * {@code run_compilation = 1} or {@code shutdown_compilation = 2}. Should be in sync with the
+     * {@code CompilerActivity} enum in {@code hotspot/share/compiler/compileBroker.hpp}.
+     */
+    private static CompilationActivityMode resolveHotSpotActivityMode(int i) {
+        return switch (i) {
+            case 0 -> CompilationActivityMode.STOP_COMPILATION;
+            case 1 -> CompilationActivityMode.RUN_COMPILATION;
+            case 2 -> CompilationActivityMode.SHUTDOWN_COMPILATION;
+            default -> throw CompilerDirectives.shouldNotReachHere("Invalid CompilationActivityMode " + i);
+        };
     }
 }