# HG changeset patch # User Roland Schatz # Date 1397649772 -7200 # Node ID 844cfee4041a26bdae38833b2faeb942178eadf3 # Parent 9c1e53adc15965bb194779d313ce4437cecb356a# Parent bd4c7b669bd8ec0b8d8430b494d15eb829071bb2 Merge. diff -r 9c1e53adc159 -r 844cfee4041a .hgignore --- a/.hgignore Tue Apr 15 19:08:29 2014 +0200 +++ b/.hgignore Wed Apr 16 14:02:52 2014 +0200 @@ -70,6 +70,7 @@ .idea/ ^cscope.out ^tags +graal.src.zip* syntax: glob *.bgv core.* diff -r 9c1e53adc159 -r 844cfee4041a CHANGELOG.md --- a/CHANGELOG.md Tue Apr 15 19:08:29 2014 +0200 +++ b/CHANGELOG.md Wed Apr 16 14:02:52 2014 +0200 @@ -4,9 +4,19 @@ ### Graal * Explicit support for oop compression/uncompression in high level graph. * LIRGenerator refactoring. +* Explicit types for inputs (InputType enum). +* Added graal.version system property to Graal enabled VM builds. +* Transitioned to JDK 8 as minimum JDK level for Graal. +* Added support for stack introspection * ... ### Truffle +* Support for collecting stack traces and for accessing the current frame in slow paths +* Renamed CallNode to DirectCallNode. +* Renamed TruffleRuntime#createCallNode to TruffleRuntime#createDirectCallNode. +* Added IndirectCallNode for calls with a changing CallTarget. +* Added TruffleRuntime#createIndirectCallNode to create an IndirectCallNode. +* DirectCallNode#inline was renamed to DirectCallNode#forceInlining(). * ... ## Version 0.2 @@ -20,7 +30,8 @@ * New (tested) invariant that equality comparisons for `JavaType`/`JavaMethod`/`JavaField` values use `.equals()` instead of `==`. * Made graph caching compilation-local. * Added AllocSpy tool for analyzing allocation in Graal using the [Java Allocation Instrumenter](https://code.google.com/p/java-allocation-instrumenter/). -* Initial support for memory arithmetic operations on x86 +* Initial support for memory arithmetic operations on x86. +* Expanded Debug logging/dumping API to avoid allocation when this Debug facilities are not enabled. ### Truffle * New API `TruffleRuntime#createCallNode` to create call nodes and to give the runtime system control over its implementation. diff -r 9c1e53adc159 -r 844cfee4041a graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/ComputeBlockOrder.java --- a/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/ComputeBlockOrder.java Tue Apr 15 19:08:29 2014 +0200 +++ b/graal/com.oracle.graal.alloc/src/com/oracle/graal/alloc/ComputeBlockOrder.java Wed Apr 16 14:02:52 2014 +0200 @@ -34,12 +34,12 @@ * with the most likely path that was left out during this process. The process iteratively * continues until all blocks are scheduled. Additionally, it is guaranteed that all blocks of a * loop are scheduled before any block following the loop is scheduled. - * + * * The machine code generator order includes reordering of loop headers such that the backward jump * is a conditional jump if there is only one loop end block. Additionally, the target of loop * backward jumps are always marked as aligned. Aligning the target of conditional jumps does not * bring a measurable benefit and is therefore avoided to keep the code size small. - * + * * The linear scan register allocator order has an additional mechanism that prevents merge nodes * from being scheduled if there is at least one highly likely predecessor still unscheduled. This * increases the probability that the merge node and the corresponding predecessor are more closely @@ -63,7 +63,7 @@ /** * Computes the block order used for the linear scan register allocator. - * + * * @return sorted list of blocks */ public static > List computeLinearScanOrder(int blockCount, T startBlock, BlocksToDoubles blockProbabilities) { @@ -77,7 +77,7 @@ /** * Computes the block order used for code emission. - * + * * @return sorted list of blocks */ public static > List computeCodeEmittingOrder(int blockCount, T startBlock, BlocksToDoubles blockProbabilities) { @@ -151,7 +151,6 @@ /** * Add a linear path to the code emission order greedily following the most likely successor. */ - @SuppressWarnings("unchecked") private static > void addPathToCodeEmittingOrder(T initialBlock, List order, PriorityQueue worklist, BitSet visitedBlocks, BlocksToDoubles blockProbabilities) { T block = initialBlock; while (block != null) { @@ -166,17 +165,17 @@ addBlock(block, order); } - Loop loop = block.getLoop(); + Loop loop = block.getLoop(); if (block.isLoopEnd() && skipLoopHeader(loop.header)) { // This is the only loop end of a skipped loop header. // Add the header immediately afterwards. - addBlock((T) loop.header, order); + addBlock(loop.header, order); // Make sure the loop successors of the loop header are aligned // as they are the target // of the backward jump. - for (Block successor : loop.header.getSuccessors()) { + for (T successor : loop.header.getSuccessors()) { if (successor.getLoopDepth() == block.getLoopDepth()) { successor.setAlign(true); } @@ -230,8 +229,8 @@ * Skip the loop header block if the loop consists of more than one block and it has only a * single loop end block. */ - private static boolean skipLoopHeader(AbstractBlock block) { - return (block.isLoopHeader() && !block.isLoopEnd() && block.getLoop().loopBegin().loopEnds().count() == 1); + private static > boolean skipLoopHeader(AbstractBlock block) { + return (block.isLoopHeader() && !block.isLoopEnd() && block.getLoop().numBackedges() == 1); } /** diff -r 9c1e53adc159 -r 844cfee4041a graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CodeCacheProvider.java --- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CodeCacheProvider.java Tue Apr 15 19:08:29 2014 +0200 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CodeCacheProvider.java Wed Apr 16 14:02:52 2014 +0200 @@ -79,9 +79,8 @@ int getMinimumOutgoingSize(); /** - * Determines if a {@link DataPatch} should be created for a given - * {@linkplain Constant#getPrimitiveAnnotation() annotated} primitive constant that part of a - * {@link CompilationResult}. A data patch is always created for an object constant. + * Determines if a {@link DataPatch} should be created for a given primitive constant that is + * part of a {@link CompilationResult}. A data patch is always created for an object constant. */ boolean needsDataPatch(Constant constant); diff -r 9c1e53adc159 -r 844cfee4041a graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CompilationResult.java --- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CompilationResult.java Tue Apr 15 19:08:29 2014 +0200 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CompilationResult.java Wed Apr 16 14:02:52 2014 +0200 @@ -28,7 +28,7 @@ import java.nio.*; import java.util.*; -import com.oracle.graal.api.code.CodeUtil.*; +import com.oracle.graal.api.code.CodeUtil.RefMapFormatter; import com.oracle.graal.api.meta.*; /** diff -r 9c1e53adc159 -r 844cfee4041a graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/InstalledCode.java --- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/InstalledCode.java Tue Apr 15 19:08:29 2014 +0200 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/InstalledCode.java Wed Apr 16 14:02:52 2014 +0200 @@ -59,18 +59,8 @@ void invalidate(); /** - * Executes the installed code with three object arguments. - * - * @param arg1 the first argument - * @param arg2 the second argument - * @param arg3 the third argument - * @return the value returned by the executed code - */ - Object execute(Object arg1, Object arg2, Object arg3) throws InvalidInstalledCodeException; - - /** * Executes the installed code with a variable number of arguments. - * + * * @param args the array of object arguments * @return the value returned by the executed code */ diff -r 9c1e53adc159 -r 844cfee4041a graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/NativeFunctionInterface.java --- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/NativeFunctionInterface.java Tue Apr 15 19:08:29 2014 +0200 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/NativeFunctionInterface.java Wed Apr 16 14:02:52 2014 +0200 @@ -32,7 +32,7 @@ /** * Resolves and returns a handle to an open native library. This method will open the library * only if it is not already open. - * + * * @param libPath the absolute path to the library * @return the resolved library handle * @throws UnsatisfiedLinkError if the library could not be found or opened @@ -48,7 +48,7 @@ /** * Resolves the function pointer {@code NativeFunctionPointer} of a native function. - * + * * @param libraries the ordered list of libraries to search for the function * @param name the name of the function to be resolved * @return a pointer to the native function @@ -60,7 +60,7 @@ * Resolves a function name to a {@linkplain NativeFunctionHandle handle} that can be called * with a given signature. The signature contains the types of the arguments that will be passed * to the handle when it is {@linkplain NativeFunctionHandle#call(Object...) called}. - * + * * @param library the handle to a resolved library * @param name the name of the function to be resolved * @param returnType the type of the return value @@ -68,26 +68,26 @@ * @return the function handle of the native function * @throws UnsatisfiedLinkError if the function handle could not be resolved */ - NativeFunctionHandle getFunctionHandle(NativeLibraryHandle library, String name, Class returnType, Class... argumentTypes); + NativeFunctionHandle getFunctionHandle(NativeLibraryHandle library, String name, Class returnType, Class... argumentTypes); /** * Resolves a function pointer to a {@linkplain NativeFunctionHandle handle} that can be called * with a given signature. The signature contains the types of the arguments that will be passed * to the handle when it is {@linkplain NativeFunctionHandle#call(Object...) called}. - * + * * @param functionPointer a function pointer * @param returnType the type of the return value * @param argumentTypes the types of the arguments * @return the function handle of the native function * @throws UnsatisfiedLinkError the function handle could not be created */ - NativeFunctionHandle getFunctionHandle(NativeFunctionPointer functionPointer, Class returnType, Class... argumentTypes); + NativeFunctionHandle getFunctionHandle(NativeFunctionPointer functionPointer, Class returnType, Class... argumentTypes); /** * Resolves a function name to a {@linkplain NativeFunctionHandle handle} that can be called * with a given signature. The signature contains the types of the arguments that will be passed * to the handle when it is {@linkplain NativeFunctionHandle#call(Object...) called}. - * + * * @param libraries the ordered list of libraries to search for the function * @param name the name of the function to be resolved * @param returnType the type of the return value @@ -95,13 +95,13 @@ * @return the function handle of the native function * @throws UnsatisfiedLinkError if the function handle could not be created */ - NativeFunctionHandle getFunctionHandle(NativeLibraryHandle[] libraries, String name, Class returnType, Class... argumentTypes); + NativeFunctionHandle getFunctionHandle(NativeLibraryHandle[] libraries, String name, Class returnType, Class... argumentTypes); /** * Resolves a function name to a {@linkplain NativeFunctionHandle handle} that can be called * with a given signature. The signature contains the types of the arguments that will be passed * to the handle when it is {@linkplain NativeFunctionHandle#call(Object...) called}. - * + * * @param name the name of the function to be resolved * @param returnType the type of the return value * @param argumentTypes the types of the arguments @@ -110,11 +110,11 @@ * {@linkplain #isDefaultLibrarySearchSupported() supported} or if the function * could not be resolved */ - NativeFunctionHandle getFunctionHandle(String name, Class returnType, Class... argumentTypes); + NativeFunctionHandle getFunctionHandle(String name, Class returnType, Class... argumentTypes); /** * Creates a {@link NativeFunctionPointer} from a raw value. - * + * * @param rawValue raw function pointer * @return {@code NativeFunctionPointer} for {@code rawValue} */ diff -r 9c1e53adc159 -r 844cfee4041a graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/RegisterConfig.java --- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/RegisterConfig.java Tue Apr 15 19:08:29 2014 +0200 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/RegisterConfig.java Wed Apr 16 14:02:52 2014 +0200 @@ -37,13 +37,20 @@ Register getReturnRegister(Kind kind); /** + * Gets the maximum allowed size of the frame. + */ + default int getMaximumFrameSize() { + return Integer.MAX_VALUE; + } + + /** * Gets the register to which {@link Register#Frame} and {@link Register#CallerFrame} are bound. */ Register getFrameRegister(); /** * Gets the calling convention describing how arguments are passed. - * + * * @param type the type of calling convention being requested * @param returnType the return type (can be null for methods returning {@code void}) * @param parameterTypes the types of the arguments of the call @@ -55,7 +62,7 @@ /** * Gets the ordered set of registers that are can be used to pass parameters according to a * given calling convention. - * + * * @param type the type of calling convention * @param kind specifies what kind of registers is being requested * @return the ordered set of registers that may be used to pass parameters in a call conforming @@ -81,7 +88,7 @@ /** * Gets the layout of the callee save area of this register configuration. - * + * * @return {@code null} if there is no callee save area */ CalleeSaveLayout getCalleeSaveLayout(); @@ -89,7 +96,7 @@ /** * Gets a map from register {@linkplain Register#number numbers} to register * {@linkplain RegisterAttributes attributes} for this register configuration. - * + * * @return an array where an element at index i holds the attributes of the register whose * number is i */ @@ -97,7 +104,7 @@ /** * Gets the register corresponding to a runtime-defined role. - * + * * @param id the identifier of a runtime-defined register role * @return the register playing the role specified by {@code id} */ diff -r 9c1e53adc159 -r 844cfee4041a graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/SpeculationLog.java --- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/SpeculationLog.java Tue Apr 15 19:08:29 2014 +0200 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/SpeculationLog.java Wed Apr 16 14:02:52 2014 +0200 @@ -31,7 +31,7 @@ * Manages a list of unique deoptimization reasons. * */ -public final class SpeculationLog { +public abstract class SpeculationLog { private volatile Object lastFailed; private volatile Collection

Assertions and Verification

Passing Arguments

Calling Another Tree

Creating a Child Node

Creating an Array of Children Nodes

Using Final Fields in Node Classes

Specializing Frame Slot Types

Storing Values in Frame Slots