Skip to content

Commit

Permalink
rename: com.oracle.graal to org.graalvm.compiler (file internal)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dougxc
dougxc committed Dec 7, 2016
1 parent 46f5f80 commit 714bbc4
Show file tree
Hide file tree
Showing 2,637 changed files with 21,601 additions and 21,573 deletions.
8 changes: 4 additions & 4 deletions docs/Debugging.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ In addition to IDE debugging, Graal includes support for *printf* style debuggin
The simplest is to place temporary usages of `System.out` where ever you need them.

For more permanent logging statements, use the `Debug.log()` method that is part of debug scope mechanism.
A (nested) debug scope is entered via [`Debug.scope(...)`](https://github.com/graalvm/graal-core/blob/6daee4240193a87f43f6b8586f2749e4bae9816e/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/Debug.java#L265). For example:
A (nested) debug scope is entered via [`Debug.scope(...)`](../graal/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/Debug.java#L265). For example:

```java
InstalledCode code = null;
Expand All @@ -47,7 +47,7 @@ try (Scope s = Debug.scope("CodeInstall", method)) {
}
```

The `Debug.log` statement will send output to the console if `CodeInstall` is matched by the `graal.Log` system property. The matching logic for this option is described in [DebugFilter](https://github.com/graalvm/graal-core/blob/6daee4240193a87f43f6b8586f2749e4bae9816e/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/DebugFilter.java#L31-L82). As mentioned in the javadoc, the same matching logic also applies to the `graal.Dump`, `graal.Time` and `-Dgraal.Count` system properties.
The `Debug.log` statement will send output to the console if `CodeInstall` is matched by the `graal.Log` system property. The matching logic for this option is described in [DebugFilter](../graal/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugFilter.java#L31-L82). As mentioned in the javadoc, the same matching logic also applies to the `graal.Dump`, `graal.Time` and `-Dgraal.Count` system properties.

## JVMCI and Graal specific options

Expand Down Expand Up @@ -243,13 +243,13 @@ However when using the interception there are several non-trivial things to reme

## Method filtering

Specifying one of the debug scope options (i.e., `-Dgraal.Log`, `-Dgraal.Dump`, `-Dgraal.Count`, or `-Dgraal.Time`) can generate a lot of output. Typically, you are only interesting in compiler output related to one or a couple of methods. Use the `-Dgraal.MethodFilter` option to specify a method filter. The matching logic for this option is described in [MethodFilter](https://github.com/graalvm/graal-core/blob/6daee4240193a87f43f6b8586f2749e4bae9816e/graal/com.oracle.graal.debug/src/com/oracle/graal/debug/MethodFilter.java#L33-L92).
Specifying one of the debug scope options (i.e., `-Dgraal.Log`, `-Dgraal.Dump`, `-Dgraal.Count`, or `-Dgraal.Time`) can generate a lot of output. Typically, you are only interesting in compiler output related to one or a couple of methods. Use the `-Dgraal.MethodFilter` option to specify a method filter. The matching logic for this option is described in [MethodFilter](../graal/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/MethodFilter.java#L33-L92).

## Dumping

In addition to logging, Graal provides support for generating (or dumping) more detailed visualizations of certain compiler data structures. Currently, there is support for dumping:

* HIR graphs (i.e., instances of [Graph](https://github.com/graalvm/graal-core/blob/6daee4240193a87f43f6b8586f2749e4bae9816e/graal/com.oracle.graal.graph/src/com/oracle/graal/graph/Graph.java)) to the [Ideal Graph Visualizer](http://ssw.jku.at/General/Staff/TW/igv.html) (IGV), and
* HIR graphs (i.e., instances of [Graph](../graal/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Graph.java)) to the [Ideal Graph Visualizer](http://ssw.jku.at/General/Staff/TW/igv.html) (IGV), and
* LIR register allocation and generated code to the [C1Visualizer](https://java.net/projects/c1visualizer/)

Dumping is enabled via the `-Dgraal.Dump` option. The dump handler for generating C1Visualizer output will also generate output for HIR graphs if the `-Dgraal.PrintCFG=true` option is specified (in addition to the `-Dgraal.Dump` option).
Expand Down
2 changes: 1 addition & 1 deletion ...ompiler.api.collections/src/org/graalvm/compiler/api/collections/CollectionsProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package com.oracle.graal.api.collections;
package org.graalvm.compiler.api.collections;

import java.util.Map;
import java.util.Set;
Expand Down
2 changes: 1 addition & 1 deletion ....api.collections/src/org/graalvm/compiler/api/collections/DefaultCollectionsProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package com.oracle.graal.api.collections;
package org.graalvm.compiler.api.collections;

import java.util.Collections;
import java.util.IdentityHashMap;
Expand Down
12 changes: 6 additions & 6 deletions ...ives.test/src/org/graalvm/compiler/api/directives/test/AllocationInstrumentationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package com.oracle.graal.api.directives.test;
package org.graalvm.compiler.api.directives.test;

import java.io.IOException;

import org.junit.Assert;
import org.junit.Test;

import com.oracle.graal.api.directives.GraalDirectives;
import com.oracle.graal.compiler.common.GraalOptions;
import com.oracle.graal.compiler.test.GraalCompilerTest;
import com.oracle.graal.options.OptionValue;
import com.oracle.graal.options.OptionValue.OverrideScope;
import org.graalvm.compiler.api.directives.GraalDirectives;
import org.graalvm.compiler.core.common.GraalOptions;
import org.graalvm.compiler.core.test.GraalCompilerTest;
import org.graalvm.compiler.options.OptionValue;
import org.graalvm.compiler.options.OptionValue.OverrideScope;

import jdk.internal.org.objectweb.asm.Opcodes;
import jdk.vm.ci.code.InstalledCode;
Expand Down
10 changes: 5 additions & 5 deletions ....directives.test/src/org/graalvm/compiler/api/directives/test/BlackholeDirectiveTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package com.oracle.graal.api.directives.test;
package org.graalvm.compiler.api.directives.test;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand All @@ -30,10 +30,10 @@
import org.junit.Assert;
import org.junit.Test;

import com.oracle.graal.api.directives.GraalDirectives;
import com.oracle.graal.compiler.test.GraalCompilerTest;
import com.oracle.graal.nodes.ParameterNode;
import com.oracle.graal.nodes.StructuredGraph;
import org.graalvm.compiler.api.directives.GraalDirectives;
import org.graalvm.compiler.core.test.GraalCompilerTest;
import org.graalvm.compiler.nodes.ParameterNode;
import org.graalvm.compiler.nodes.StructuredGraph;

/**
* Tests for {@link GraalDirectives#blackhole}.
Expand Down
22 changes: 11 additions & 11 deletions ...ves.test/src/org/graalvm/compiler/api/directives/test/ControlFlowAnchorDirectiveTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package com.oracle.graal.api.directives.test;
package org.graalvm.compiler.api.directives.test;

import java.lang.annotation.ElementType;
import java.lang.annotation.Repeatable;
Expand All @@ -34,16 +34,16 @@
import org.junit.Assert;
import org.junit.Test;

import com.oracle.graal.api.directives.GraalDirectives;
import com.oracle.graal.compiler.test.GraalCompilerTest;
import com.oracle.graal.graph.Node;
import com.oracle.graal.graph.iterators.NodeIterable;
import com.oracle.graal.nodes.IfNode;
import com.oracle.graal.nodes.LoopBeginNode;
import com.oracle.graal.nodes.ReturnNode;
import com.oracle.graal.nodes.StructuredGraph;
import com.oracle.graal.nodes.StructuredGraph.AllowAssumptions;
import com.oracle.graal.nodes.debug.ControlFlowAnchorNode;
import org.graalvm.compiler.api.directives.GraalDirectives;
import org.graalvm.compiler.core.test.GraalCompilerTest;
import org.graalvm.compiler.graph.Node;
import org.graalvm.compiler.graph.iterators.NodeIterable;
import org.graalvm.compiler.nodes.IfNode;
import org.graalvm.compiler.nodes.LoopBeginNode;
import org.graalvm.compiler.nodes.ReturnNode;
import org.graalvm.compiler.nodes.StructuredGraph;
import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
import org.graalvm.compiler.nodes.debug.ControlFlowAnchorNode;

import jdk.vm.ci.meta.ResolvedJavaMethod;

Expand Down
6 changes: 3 additions & 3 deletions ...directives.test/src/org/graalvm/compiler/api/directives/test/DeoptimizeDirectiveTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package com.oracle.graal.api.directives.test;
package org.graalvm.compiler.api.directives.test;

import jdk.vm.ci.code.InstalledCode;
import jdk.vm.ci.meta.ResolvedJavaMethod;

import org.junit.Assert;
import org.junit.Test;

import com.oracle.graal.api.directives.GraalDirectives;
import com.oracle.graal.compiler.test.GraalCompilerTest;
import org.graalvm.compiler.api.directives.GraalDirectives;
import org.graalvm.compiler.core.test.GraalCompilerTest;

public class DeoptimizeDirectiveTest extends GraalCompilerTest {

Expand Down
12 changes: 6 additions & 6 deletions ...ctives.test/src/org/graalvm/compiler/api/directives/test/IsMethodInlineDirectiveTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package com.oracle.graal.api.directives.test;
package org.graalvm.compiler.api.directives.test;

import org.junit.Test;

import com.oracle.graal.api.directives.GraalDirectives;
import com.oracle.graal.compiler.common.GraalOptions;
import com.oracle.graal.compiler.test.GraalCompilerTest;
import com.oracle.graal.options.OptionValue;
import com.oracle.graal.options.OptionValue.OverrideScope;
import org.graalvm.compiler.api.directives.GraalDirectives;
import org.graalvm.compiler.core.common.GraalOptions;
import org.graalvm.compiler.core.test.GraalCompilerTest;
import org.graalvm.compiler.options.OptionValue;
import org.graalvm.compiler.options.OptionValue.OverrideScope;

import jdk.vm.ci.code.InstalledCode;
import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
Expand Down
12 changes: 6 additions & 6 deletions ....directives.test/src/org/graalvm/compiler/api/directives/test/IterationDirectiveTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package com.oracle.graal.api.directives.test;
package org.graalvm.compiler.api.directives.test;

import org.junit.Assert;
import org.junit.Test;

import com.oracle.graal.api.directives.GraalDirectives;
import com.oracle.graal.compiler.test.GraalCompilerTest;
import com.oracle.graal.graph.iterators.NodeIterable;
import com.oracle.graal.nodes.LoopBeginNode;
import com.oracle.graal.nodes.StructuredGraph;
import org.graalvm.compiler.api.directives.GraalDirectives;
import org.graalvm.compiler.core.test.GraalCompilerTest;
import org.graalvm.compiler.graph.iterators.NodeIterable;
import org.graalvm.compiler.nodes.LoopBeginNode;
import org.graalvm.compiler.nodes.StructuredGraph;

public class IterationDirectiveTest extends GraalCompilerTest {

Expand Down
12 changes: 6 additions & 6 deletions ...directives.test/src/org/graalvm/compiler/api/directives/test/LockInstrumentationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package com.oracle.graal.api.directives.test;
package org.graalvm.compiler.api.directives.test;

import java.io.IOException;

import org.junit.Assert;
import org.junit.Test;

import com.oracle.graal.api.directives.GraalDirectives;
import com.oracle.graal.compiler.common.GraalOptions;
import com.oracle.graal.compiler.test.GraalCompilerTest;
import com.oracle.graal.options.OptionValue;
import com.oracle.graal.options.OptionValue.OverrideScope;
import org.graalvm.compiler.api.directives.GraalDirectives;
import org.graalvm.compiler.core.common.GraalOptions;
import org.graalvm.compiler.core.test.GraalCompilerTest;
import org.graalvm.compiler.options.OptionValue;
import org.graalvm.compiler.options.OptionValue.OverrideScope;

import jdk.internal.org.objectweb.asm.Opcodes;
import jdk.vm.ci.code.InstalledCode;
Expand Down
16 changes: 8 additions & 8 deletions ...api.directives.test/src/org/graalvm/compiler/api/directives/test/OpaqueDirectiveTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package com.oracle.graal.api.directives.test;
package org.graalvm.compiler.api.directives.test;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand All @@ -30,13 +30,13 @@
import org.junit.Assert;
import org.junit.Test;

import com.oracle.graal.api.directives.GraalDirectives;
import com.oracle.graal.compiler.test.GraalCompilerTest;
import com.oracle.graal.nodes.ConstantNode;
import com.oracle.graal.nodes.ReturnNode;
import com.oracle.graal.nodes.StructuredGraph;
import com.oracle.graal.nodes.calc.AddNode;
import com.oracle.graal.nodes.calc.ConditionalNode;
import org.graalvm.compiler.api.directives.GraalDirectives;
import org.graalvm.compiler.core.test.GraalCompilerTest;
import org.graalvm.compiler.nodes.ConstantNode;
import org.graalvm.compiler.nodes.ReturnNode;
import org.graalvm.compiler.nodes.StructuredGraph;
import org.graalvm.compiler.nodes.calc.AddNode;
import org.graalvm.compiler.nodes.calc.ConditionalNode;

/**
* Tests for {@link GraalDirectives#opaque}.
Expand Down
14 changes: 7 additions & 7 deletions ...irectives.test/src/org/graalvm/compiler/api/directives/test/ProbabilityDirectiveTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package com.oracle.graal.api.directives.test;
package org.graalvm.compiler.api.directives.test;

import org.junit.Assert;
import org.junit.Test;

import com.oracle.graal.api.directives.GraalDirectives;
import com.oracle.graal.compiler.test.GraalCompilerTest;
import com.oracle.graal.graph.iterators.NodeIterable;
import com.oracle.graal.nodes.AbstractBeginNode;
import com.oracle.graal.nodes.IfNode;
import com.oracle.graal.nodes.StructuredGraph;
import org.graalvm.compiler.api.directives.GraalDirectives;
import org.graalvm.compiler.core.test.GraalCompilerTest;
import org.graalvm.compiler.graph.iterators.NodeIterable;
import org.graalvm.compiler.nodes.AbstractBeginNode;
import org.graalvm.compiler.nodes.IfNode;
import org.graalvm.compiler.nodes.StructuredGraph;

public class ProbabilityDirectiveTest extends GraalCompilerTest {

Expand Down
20 changes: 10 additions & 10 deletions ...i.directives.test/src/org/graalvm/compiler/api/directives/test/RootNameDirectiveTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package com.oracle.graal.api.directives.test;
package org.graalvm.compiler.api.directives.test;

import java.io.ByteArrayOutputStream;
import java.lang.reflect.Method;
Expand All @@ -32,15 +32,15 @@
import org.junit.Test;

import com.google.monitoring.runtime.instrumentation.common.com.google.common.base.Objects;
import com.oracle.graal.api.directives.GraalDirectives;
import com.oracle.graal.compiler.common.GraalOptions;
import com.oracle.graal.compiler.test.GraalCompilerTest;
import com.oracle.graal.debug.Debug;
import com.oracle.graal.debug.Debug.Scope;
import com.oracle.graal.nodes.StructuredGraph;
import com.oracle.graal.options.OptionValue;
import com.oracle.graal.options.OptionValue.OverrideScope;
import com.oracle.graal.printer.IdealGraphPrinter;
import org.graalvm.compiler.api.directives.GraalDirectives;
import org.graalvm.compiler.core.common.GraalOptions;
import org.graalvm.compiler.core.test.GraalCompilerTest;
import org.graalvm.compiler.debug.Debug;
import org.graalvm.compiler.debug.Debug.Scope;
import org.graalvm.compiler.nodes.StructuredGraph;
import org.graalvm.compiler.options.OptionValue;
import org.graalvm.compiler.options.OptionValue.OverrideScope;
import org.graalvm.compiler.printer.IdealGraphPrinter;

import jdk.vm.ci.code.CodeCacheProvider;
import jdk.vm.ci.code.InstalledCode;
Expand Down
4 changes: 2 additions & 2 deletions ...er.api.directives.test/src/org/graalvm/compiler/api/directives/test/TinyInstrumentor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package com.oracle.graal.api.directives.test;
package org.graalvm.compiler.api.directives.test;

import java.io.IOException;
import java.util.ArrayList;
Expand All @@ -29,7 +29,7 @@
import java.util.List;
import java.util.Map;

import com.oracle.graal.test.ExportingClassLoader;
import org.graalvm.compiler.test.ExportingClassLoader;

import jdk.internal.org.objectweb.asm.ClassReader;
import jdk.internal.org.objectweb.asm.ClassWriter;
Expand Down
6 changes: 3 additions & 3 deletions ...alvm.compiler.api.directives/src/org/graalvm/compiler/api/directives/GraalDirectives.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package com.oracle.graal.api.directives;
package org.graalvm.compiler.api.directives;

import java.nio.charset.Charset;

Expand Down Expand Up @@ -388,9 +388,9 @@ public static void instrumentationBegin() {
*
* <pre>
* 0 new java.lang.Object
* 3 invokestatic com.oracle.graal.api.directives.GraalDirectives.instrumentationBeginForPredecessor() : void
* 3 invokestatic org.graalvm.compiler.api.directives.GraalDirectives.instrumentationBeginForPredecessor() : void
* 6 invokestatic AllocationProfiler.countActualAllocation() : void
* 9 invokestatic com.oracle.graal.api.directives.GraalDirectives.instrumentationEnd() : void
* 9 invokestatic org.graalvm.compiler.api.directives.GraalDirectives.instrumentationEnd() : void
* 12 invokespecial java.lang.Object()
* </pre>
*
Expand Down
2 changes: 1 addition & 1 deletion ...ompiler.api.replacements/src/org/graalvm/compiler/api/replacements/ClassSubstitution.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package com.oracle.graal.api.replacements;
package org.graalvm.compiler.api.replacements;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand Down
2 changes: 1 addition & 1 deletion ...org.graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/Fold.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package com.oracle.graal.api.replacements;
package org.graalvm.compiler.api.replacements;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand Down
2 changes: 1 addition & 1 deletion ...mpiler.api.replacements/src/org/graalvm/compiler/api/replacements/MethodSubstitution.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package com.oracle.graal.api.replacements;
package org.graalvm.compiler.api.replacements;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand Down
2 changes: 1 addition & 1 deletion ...pi.replacements/src/org/graalvm/compiler/api/replacements/MethodSubstitutionRegistry.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package com.oracle.graal.api.replacements;
package org.graalvm.compiler.api.replacements;

import java.lang.reflect.Type;

Expand Down
2 changes: 1 addition & 1 deletion ....graalvm.compiler.api.replacements/src/org/graalvm/compiler/api/replacements/Snippet.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
package com.oracle.graal.api.replacements;
package org.graalvm.compiler.api.replacements;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
Expand Down
Loading

0 comments on commit 714bbc4

Please sign in to comment.