move jdk.compiler.graal.truffle.compiler.* to jdk.compiler.graal.truf…

…fle.*
oracle · Oct 14, 2023 · 463bd6b · 463bd6b
1 parent b714236
commit 463bd6b
Show file tree

Hide file tree

Showing 151 changed files with 352 additions and 353 deletions.
diff --git a/...er/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CheckGraalInvariants.java b/...er/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CheckGraalInvariants.java
@@ -203,7 +203,7 @@ protected void updateVerifiers(List<VerifyPhase<CoreProviders>> verifiers) {
          */
         public boolean shouldCheckUsage(OptionDescriptor option) {
             Class<?> declaringClass = option.getDeclaringClass();
-            if (declaringClass.getName().equals("jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions")) {
+            if (declaringClass.getName().equals("jdk.compiler.graal.truffle.TruffleCompilerOptions")) {
                 /*
                  * These options are deprecated and will be removed in GraalVM 20.2.0. The
                  * TruffleIntrinsifyFrameAccess option has no replacement and is unused.

diff --git a/...ler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptionsVerifierTest.java b/...ler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptionsVerifierTest.java
@@ -56,7 +56,7 @@
 public class OptionsVerifierTest {
 
     private static Set<String> ALLOWLIST = new TreeSet<>(Arrays.asList(//
-                    "jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions"));
+                    "jdk.compiler.graal.truffle.TruffleCompilerOptions"));
 
     @Test
     public void verifyOptions() throws IOException {

diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyDebugUsage.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyDebugUsage.java
@@ -50,9 +50,9 @@
 import jdk.compiler.graal.replacements.ReplacementsImpl;
 import jdk.compiler.graal.replacements.SnippetTemplate;
 import jdk.compiler.graal.test.GraalTest.MethodSource;
-import jdk.compiler.graal.truffle.compiler.PerformanceInformationHandler;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
-import jdk.compiler.graal.truffle.compiler.phases.inlining.CallTree;
+import jdk.compiler.graal.truffle.PerformanceInformationHandler;
+import jdk.compiler.graal.truffle.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.phases.inlining.CallTree;
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.PrimitiveConstant;

diff --git a/...dk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AgnosticInliningPhaseTest.java b/...dk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AgnosticInliningPhaseTest.java
@@ -26,11 +26,11 @@
 
 import jdk.compiler.graal.core.common.CompilationIdentifier;
 import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.truffle.compiler.PartialEvaluator;
-import jdk.compiler.graal.truffle.compiler.PostPartialEvaluationSuite;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
-import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
-import jdk.compiler.graal.truffle.compiler.phases.inlining.AgnosticInliningPhase;
+import jdk.compiler.graal.truffle.PartialEvaluator;
+import jdk.compiler.graal.truffle.PostPartialEvaluationSuite;
+import jdk.compiler.graal.truffle.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.TruffleTierContext;
+import jdk.compiler.graal.truffle.phases.inlining.AgnosticInliningPhase;
 import org.graalvm.polyglot.Context;
 import org.junit.Before;
 

diff --git a/...ompiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsIndexOfWithMaskTest.java b/...ompiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsIndexOfWithMaskTest.java
@@ -29,7 +29,7 @@
 
 import jdk.compiler.graal.core.test.GraalCompilerTest;
 import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins;
+import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;

diff --git a/....test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java b/....test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java
@@ -33,7 +33,7 @@
 import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
 import jdk.compiler.graal.options.OptionValues;
 import jdk.compiler.graal.replacements.nodes.ArrayRegionEqualsNode;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins;
+import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins;
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Test;

diff --git a/...er.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java b/...er.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java
@@ -28,7 +28,7 @@
 
 import jdk.compiler.graal.core.test.GraalCompilerTest;
 import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins;
+import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;

diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsTest.java
@@ -28,7 +28,7 @@
 
 import jdk.compiler.graal.core.test.GraalCompilerTest;
 import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins;
+import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;

diff --git a/...k.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerDirectivesTypeTest.java b/...k.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerDirectivesTypeTest.java
@@ -26,8 +26,8 @@
 
 import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
 import jdk.compiler.graal.serviceprovider.GraalServices;
-import jdk.compiler.graal.truffle.compiler.substitutions.GraphBuilderInvocationPluginProvider;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleGraphBuilderPlugins;
+import jdk.compiler.graal.truffle.substitutions.GraphBuilderInvocationPluginProvider;
+import jdk.compiler.graal.truffle.substitutions.TruffleGraphBuilderPlugins;
 import org.junit.Test;
 
 import com.oracle.truffle.api.CompilerDirectives;

diff --git a/.../src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerLoggingTest.java b/.../src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerLoggingTest.java
@@ -36,7 +36,7 @@
 import com.oracle.truffle.api.TruffleOptions;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import jdk.compiler.graal.debug.TTY;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.TruffleCompilerImpl;
 import org.graalvm.polyglot.Context;
 import org.junit.Assert;
 import org.junit.Assume;

diff --git a/...c/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ConditionAnchoringTest.java b/...c/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ConditionAnchoringTest.java
@@ -54,8 +54,8 @@
 import jdk.compiler.graal.phases.common.FloatingReadPhase;
 import jdk.compiler.graal.phases.common.HighTierLoweringPhase;
 import jdk.compiler.graal.phases.common.LoweringPhase;
-import jdk.compiler.graal.truffle.compiler.nodes.ObjectLocationIdentity;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleGraphBuilderPlugins;
+import jdk.compiler.graal.truffle.nodes.ObjectLocationIdentity;
+import jdk.compiler.graal.truffle.substitutions.TruffleGraphBuilderPlugins;
 import org.junit.Test;
 
 import jdk.vm.ci.meta.JavaKind;

diff --git a/...er.graal.test/src/jdk/compiler/graal/truffle/test/DynamicObjectPartialEvaluationTest.java b/...er.graal.test/src/jdk/compiler/graal/truffle/test/DynamicObjectPartialEvaluationTest.java
@@ -35,7 +35,7 @@
 import jdk.compiler.graal.nodes.extended.UnsafeAccessNode;
 import jdk.compiler.graal.nodes.java.LoadFieldNode;
 import jdk.compiler.graal.nodes.java.StoreFieldNode;
-import jdk.compiler.graal.truffle.compiler.nodes.ObjectLocationIdentity;
+import jdk.compiler.graal.truffle.nodes.ObjectLocationIdentity;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/...rc/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/EncodedGraphCacheTest.java b/...rc/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/EncodedGraphCacheTest.java
@@ -34,9 +34,9 @@
 import org.graalvm.collections.EconomicMap;
 import jdk.compiler.graal.debug.DebugContext;
 import jdk.compiler.graal.nodes.EncodedGraph;
-import jdk.compiler.graal.truffle.compiler.PartialEvaluator;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilation;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.PartialEvaluator;
+import jdk.compiler.graal.truffle.TruffleCompilation;
+import jdk.compiler.graal.truffle.TruffleCompilerImpl;
 import org.graalvm.polyglot.Context;
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExactMathTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExactMathTest.java
@@ -26,7 +26,7 @@
 
 import jdk.compiler.graal.nodes.calc.RoundNode;
 import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleGraphBuilderPlugins;
+import jdk.compiler.graal.truffle.substitutions.TruffleGraphBuilderPlugins;
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Test;

diff --git a/...ler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningTest.java b/...ler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningTest.java
@@ -55,7 +55,7 @@
 import jdk.compiler.graal.options.OptionValues;
 import jdk.compiler.graal.phases.common.CanonicalizerPhase;
 import jdk.compiler.graal.phases.tiers.HighTierContext;
-import jdk.compiler.graal.truffle.compiler.host.HostInliningPhase;
+import jdk.compiler.graal.truffle.host.HostInliningPhase;
 import jdk.compiler.graal.truffle.test.HostInliningTestFactory.IfNodeGen;
 import org.graalvm.polyglot.Context;
 import org.junit.Assert;

diff --git a/....compiler.graal.test/src/jdk/compiler/graal/truffle/test/InstrumentBranchesPhaseTest.java b/....compiler.graal.test/src/jdk/compiler/graal/truffle/test/InstrumentBranchesPhaseTest.java
@@ -30,8 +30,8 @@
 import jdk.compiler.graal.api.directives.GraalDirectives;
 import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode;
 import jdk.compiler.graal.truffle.test.nodes.RootTestNode;
-import jdk.compiler.graal.truffle.compiler.PartialEvaluator;
-import jdk.compiler.graal.truffle.compiler.phases.InstrumentPhase;
+import jdk.compiler.graal.truffle.PartialEvaluator;
+import jdk.compiler.graal.truffle.phases.InstrumentPhase;
 import org.graalvm.polyglot.Context;
 import org.junit.Assert;
 import org.junit.Before;

diff --git a/...rc/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PartialEvaluationTest.java b/...rc/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PartialEvaluationTest.java
@@ -44,13 +44,13 @@
 import jdk.compiler.graal.phases.PhaseSuite;
 import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase;
 import jdk.compiler.graal.phases.tiers.HighTierContext;
-import jdk.compiler.graal.truffle.compiler.PartialEvaluator;
-import jdk.compiler.graal.truffle.compiler.PerformanceInformationHandler;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilation;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
-import jdk.compiler.graal.truffle.compiler.TruffleDebugJavaMethod;
-import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
-import jdk.compiler.graal.truffle.compiler.phases.TruffleTier;
+import jdk.compiler.graal.truffle.PartialEvaluator;
+import jdk.compiler.graal.truffle.PerformanceInformationHandler;
+import jdk.compiler.graal.truffle.TruffleCompilation;
+import jdk.compiler.graal.truffle.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.TruffleDebugJavaMethod;
+import jdk.compiler.graal.truffle.TruffleTierContext;
+import jdk.compiler.graal.truffle.phases.TruffleTier;
 import org.junit.Assert;
 
 import com.oracle.truffle.api.CallTarget;

diff --git a/...c/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PerformanceWarningTest.java b/...c/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PerformanceWarningTest.java
@@ -29,8 +29,8 @@
 import jdk.compiler.graal.debug.DebugCloseable;
 import jdk.compiler.graal.debug.DebugContext;
 import jdk.compiler.graal.debug.DebugContext.Builder;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilation;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.TruffleCompilation;
+import jdk.compiler.graal.truffle.TruffleCompilerImpl;
 import org.graalvm.polyglot.Context;
 import org.junit.Assert;
 import org.junit.Before;

diff --git a/...ler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PhiTransformTest.java b/...ler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PhiTransformTest.java
@@ -41,8 +41,8 @@
 import jdk.compiler.graal.phases.BasePhase;
 import jdk.compiler.graal.phases.tiers.HighTierContext;
 import jdk.compiler.graal.phases.tiers.Suites;
-import jdk.compiler.graal.truffle.compiler.nodes.AnyExtendNode;
-import jdk.compiler.graal.truffle.compiler.phases.PhiTransformPhase;
+import jdk.compiler.graal.truffle.nodes.AnyExtendNode;
+import jdk.compiler.graal.truffle.phases.PhiTransformPhase;
 import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase;
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/.../jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleCompilerImplTest.java b/.../jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleCompilerImplTest.java
@@ -30,9 +30,9 @@
 import jdk.compiler.graal.core.common.CompilationIdentifier;
 import jdk.compiler.graal.core.target.Backend;
 import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.truffle.compiler.KnownTruffleTypes;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilation;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.KnownTruffleTypes;
+import jdk.compiler.graal.truffle.TruffleCompilation;
+import jdk.compiler.graal.truffle.TruffleCompilerImpl;
 import org.graalvm.polyglot.Context;
 import org.junit.After;
 import org.junit.Assume;

diff --git a/...iler.graal.test/src/jdk/compiler/graal/truffle/test/libgraal/JNIExceptionWrapperTest.java b/...iler.graal.test/src/jdk/compiler/graal/truffle/test/libgraal/JNIExceptionWrapperTest.java
@@ -36,7 +36,7 @@
 import jdk.compiler.graal.core.CompilationWrapper;
 import jdk.compiler.graal.core.GraalCompilerOptions;
 import jdk.compiler.graal.test.SubprocessUtil;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.TruffleCompilerImpl;
 import jdk.compiler.graal.truffle.test.TestWithPolyglotOptions;
 import org.junit.Test;
 

diff --git a/.../src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringTest.java b/.../src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringTest.java
@@ -37,7 +37,7 @@
 import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
 import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
 import jdk.compiler.graal.replacements.ConstantBindingParameterPlugin;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins;
+import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins;
 
 import jdk.vm.ci.aarch64.AArch64;
 import jdk.vm.ci.amd64.AMD64;

diff --git a/...e/compiler/AbstractKnownTruffleTypes.java → ...al/truffle/AbstractKnownTruffleTypes.java b/...e/compiler/AbstractKnownTruffleTypes.java → ...al/truffle/AbstractKnownTruffleTypes.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/...er/AbstractTruffleCompilationSupport.java → ...le/AbstractTruffleCompilationSupport.java b/...er/AbstractTruffleCompilationSupport.java → ...le/AbstractTruffleCompilationSupport.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import com.oracle.truffle.compiler.TruffleCompilationSupport;
 import com.oracle.truffle.compiler.TruffleCompilerOptionDescriptor;

diff --git a/...mmunityPartialEvaluatorConfiguration.java → ...mmunityPartialEvaluatorConfiguration.java b/...mmunityPartialEvaluatorConfiguration.java → ...mmunityPartialEvaluatorConfiguration.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import jdk.compiler.graal.serviceprovider.ServiceProvider;
 

diff --git a/...EconomyPartialEvaluatorConfiguration.java → ...EconomyPartialEvaluatorConfiguration.java b/...EconomyPartialEvaluatorConfiguration.java → ...EconomyPartialEvaluatorConfiguration.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import jdk.compiler.graal.serviceprovider.ServiceProvider;
 

diff --git a/...truffle/compiler/ExpansionStatistics.java → ...er/graal/truffle/ExpansionStatistics.java b/...truffle/compiler/ExpansionStatistics.java → ...er/graal/truffle/ExpansionStatistics.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;

diff --git a/...compiler/GraphTooBigBailoutException.java → .../truffle/GraphTooBigBailoutException.java b/...compiler/GraphTooBigBailoutException.java → .../truffle/GraphTooBigBailoutException.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import jdk.compiler.graal.core.common.PermanentBailoutException;
 

diff --git a/...l/truffle/compiler/KnownTruffleTypes.java → ...iler/graal/truffle/KnownTruffleTypes.java b/...l/truffle/compiler/KnownTruffleTypes.java → ...iler/graal/truffle/KnownTruffleTypes.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.ref.Reference;

diff --git a/...ompiler/PEAgnosticInlineInvokePlugin.java → ...truffle/PEAgnosticInlineInvokePlugin.java b/...ompiler/PEAgnosticInlineInvokePlugin.java → ...truffle/PEAgnosticInlineInvokePlugin.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...e/compiler/ParsingInlineInvokePlugin.java → ...al/truffle/ParsingInlineInvokePlugin.java b/...e/compiler/ParsingInlineInvokePlugin.java → ...al/truffle/ParsingInlineInvokePlugin.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import jdk.compiler.graal.nodes.ValueNode;
 import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;

diff --git a/...al/truffle/compiler/PartialEvaluator.java → ...piler/graal/truffle/PartialEvaluator.java b/...al/truffle/compiler/PartialEvaluator.java → ...piler/graal/truffle/PartialEvaluator.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import java.net.URI;
 import java.nio.Buffer;
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.truffle.compiler.phases.DeoptimizeOnExceptionPhase;
-import jdk.compiler.graal.truffle.compiler.phases.InstrumentPhase;
-import jdk.compiler.graal.truffle.compiler.substitutions.GraphBuilderInvocationPluginProvider;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleGraphBuilderPlugins;
+import jdk.compiler.graal.truffle.phases.DeoptimizeOnExceptionPhase;
+import jdk.compiler.graal.truffle.phases.InstrumentPhase;
+import jdk.compiler.graal.truffle.substitutions.GraphBuilderInvocationPluginProvider;
+import jdk.compiler.graal.truffle.substitutions.TruffleGraphBuilderPlugins;
 import org.graalvm.collections.EconomicMap;
 import jdk.compiler.graal.core.common.type.StampPair;
 import jdk.compiler.graal.graph.Graph;

diff --git a/...mpiler/PartialEvaluatorConfiguration.java → ...ruffle/PartialEvaluatorConfiguration.java b/...mpiler/PartialEvaluatorConfiguration.java → ...ruffle/PartialEvaluatorConfiguration.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
-import jdk.compiler.graal.truffle.compiler.substitutions.GraphDecoderInvocationPluginProvider;
+import jdk.compiler.graal.truffle.substitutions.GraphDecoderInvocationPluginProvider;
 import jdk.vm.ci.code.Architecture;
 import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
 import jdk.compiler.graal.phases.util.Providers;

diff --git a/...mpiler/PerformanceInformationHandler.java → ...ruffle/PerformanceInformationHandler.java b/...mpiler/PerformanceInformationHandler.java → ...ruffle/PerformanceInformationHandler.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import java.io.Closeable;
 import java.util.ArrayList;
@@ -33,7 +33,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import jdk.compiler.graal.truffle.compiler.phases.TruffleTier;
+import jdk.compiler.graal.truffle.phases.TruffleTier;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.MapCursor;

diff --git a/.../compiler/PostPartialEvaluationSuite.java → ...l/truffle/PostPartialEvaluationSuite.java b/.../compiler/PostPartialEvaluationSuite.java → ...l/truffle/PostPartialEvaluationSuite.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import jdk.compiler.graal.loop.phases.ConvertDeoptimizeToGuardPhase;
 import jdk.compiler.graal.nodes.StructuredGraph;
@@ -33,8 +33,8 @@
 import jdk.compiler.graal.phases.common.CanonicalizerPhase;
 import jdk.compiler.graal.phases.common.ConditionalEliminationPhase;
 import jdk.compiler.graal.phases.common.inlining.InliningUtil;
-import jdk.compiler.graal.truffle.compiler.phases.FrameAccessVerificationPhase;
-import jdk.compiler.graal.truffle.compiler.phases.PhiTransformPhase;
+import jdk.compiler.graal.truffle.phases.FrameAccessVerificationPhase;
+import jdk.compiler.graal.truffle.phases.PhiTransformPhase;
 import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase;
 
 public class PostPartialEvaluationSuite extends PhaseSuite<TruffleTierContext> {